From bd3675f9a3e91edf997c0515f0f1fce1669f038c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 22 Jun 2014 11:55:43 +0200 Subject: [PATCH] nscd: Remove unused typedef and variable. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The attached patch removed the unused ‘thread_info_t’ typedef and the ‘thread_info’ variable from nscd.c. The former conflicts with a GNU Mach typedef, and the latter conflicts with a GNU Mach function declaration: . Tested on x86_64-linux-gnu. --- ChangeLog | 5 +++++ nscd/nscd.c | 14 -------------- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index 67b7896..92b567a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2014-06-22 Ludovic Courtès + + * nscd/nscd.c (thread_info_t): Remove typedef. + (thread_info): Remove variable. + 2014-06-21 Allan McRae * NEWS: Mention CVE-2014-4043. diff --git a/nscd/nscd.c b/nscd/nscd.c index a4c71e9..3dd1135 100644 --- a/nscd/nscd.c +++ b/nscd/nscd.c @@ -57,20 +57,6 @@ #define PACKAGE _libc_intl_domainname -/* Structure used by main() thread to keep track of the number of - active threads. Used to limit how many threads it will create - and under a shutdown condition to wait till all in-progress - requests have finished before "turning off the lights". */ - -typedef struct -{ - int num_active; - pthread_cond_t thread_exit_cv; - pthread_mutex_t mutex; -} thread_info_t; - -thread_info_t thread_info; - int do_shutdown; int disabled_passwd; int disabled_group; -- 2.7.4