Fix nscd/cachedumper.c compile errors

[thirdparty/glibc.git] / localedata / bug-setlocale1.c

diff --git a/localedata/bug-setlocale1.c b/localedata/bug-setlocale1.c
index dc7f6f3f081ed8e20de05a168e9df72125724a22..546ea7beb8116728ca7c74ce82a187f57d426db3 100644 (file)
--- a/localedata/bug-setlocale1.c
+++ b/localedata/bug-setlocale1.c
@@ -7,44 +7,8 @@
 
 
 static int
-do_test (int argc, char *argv[])
+do_test (void)
 {
-  if (argc > 1)
-    {
-      char *newargv[5];
-      int i;
-      if (argc != 2 && argc != 5)
-       {
-         printf ("wrong number of arguments (%d)\n", argc);
-         return 1;
-       }
-
-      for (i = 0; i < (argc == 5 ? 4 : 1); i++)
-       newargv[i] = argv[i + 1];
-      newargv[i] = NULL;
-
-      char *env[3];
-      env[0] = (char *) "LC_CTYPE=de_DE.UTF-8";
-      char *loc = getenv ("LOCPATH");
-      if (loc == NULL || loc[0] == '\0')
-       {
-         puts ("LOCPATH not set");
-         return 1;
-       }
-      asprintf (&env[1], "LOCPATH=%s", loc);
-      if (env[1] == NULL)
-       {
-         puts ("asprintf failed");
-         return 1;
-       }
-      env[2] = NULL;
-
-      execve (newargv[0], newargv, env);
-
-      puts ("execve returned");
-      return 1;
-    }
-
   int result = 0;
 
   char *a = setlocale (LC_ALL, "");
@@ -128,5 +92,5 @@ do_test (int argc, char *argv[])
   return result;
 }
 
-#define TEST_FUNCTION do_test (argc, argv)
+#define TEST_FUNCTION do_test ()
 #include "../test-skeleton.c"