nscd: Remove unused typedef and variable.

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:
<https://lists.gnu.org/archive/html/bug-hurd/2014-06/msg00101.html>.

Tested on x86_64-linux-gnu.

diff --git a/ChangeLog b/ChangeLog
index 67b789622050c90073255a84c90264dcac3d1416..92b567a59f86e68115804eb09faff5e315f1d14e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-06-22  Ludovic Courtès  <ludo@gnu.org>
+
+       * nscd/nscd.c (thread_info_t): Remove typedef.
+       (thread_info): Remove variable.
+
 2014-06-21  Allan McRae  <allan@archlinux.org>
 
        * NEWS: Mention CVE-2014-4043.

diff --git a/nscd/nscd.c b/nscd/nscd.c
index a4c71e90e201c5097f6c7a40b2e83b2f83b51157..3dd1135b466260ec0d4ed586726df1bbd355ef6b 100644 (file)
--- 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;