This is the mail archive of the libc-hacker@sources.redhat.com mailing list for the glibc project.

Note that libc-hacker is a closed list. You may look at the archives of this list, but subscription and posting are not open.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Patch for test-skeleton.c



Running the testsuite I got (with my NSS patch installed):

tst-getaddrinfo.c:28: warning: no previous prototype for `do_test'
tst-getaddrinfo.c: In function `do_test':
tst-getaddrinfo.c:34: warning: comparison between signed and unsigned
In file included from tst-getaddrinfo.c:65:
../test-skeleton.c: At top level:
../test-skeleton.c:59: redefinition of `struct name_list'

Here's a patch.  Ok to commit?

Andreas

2000-12-18  Andreas Jaeger  <aj@suse.de>

	* test-skeleton.c: Use temp_name_list instead of temp_name_list to
	avoid collision with name_list from inet/netgroup.h.

============================================================
Index: test-skeleton.c
--- test-skeleton.c	2000/11/28 06:36:05	1.10
+++ test-skeleton.c	2000/12/18 14:15:56
@@ -55,24 +55,25 @@
 static const char *test_dir;
 
 /* List of temporary files.  */
-struct name_list
+struct temp_name_list
 {
   struct qelem q;
   const char *name;
-} *name_list;
+} *temp_name_list;
 
 /* Add temporary files in list.  */
 static void
 add_temp_file (const char *name)
 {
-  struct name_list *newp = (struct name_list *) calloc (sizeof (*newp), 1);
+  struct temp_name_list *newp
+    = (struct temp_name_list *) calloc (sizeof (*newp), 1);
   if (newp != NULL)
     {
       newp->name = name;
-      if (name_list == NULL)
-	name_list = (struct name_list *) &newp->q;
+      if (temp_name_list == NULL)
+	temp_name_list = (struct temp_name_list *) &newp->q;
       else
-	insque (newp, name_list);
+	insque (newp, temp_name_list);
     }
 }
 
@@ -80,10 +81,10 @@
 static void
 delete_temp_files (void)
 {
-  while (name_list != NULL)
+  while (temp_name_list != NULL)
     {
-      remove (name_list->name);
-      name_list = (struct name_list *) name_list->q.q_forw;
+      remove (temp_name_list->name);
+      temp_name_list = (struct temp_name_list *) temp_name_list->q.q_forw;
     }
 }
 

-- 
 Andreas Jaeger
  SuSE Labs aj@suse.de
   private aj@arthur.inka.de
    http://www.suse.de/~aj

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]