* malloc/memusagestat.c (main): Use return instead of exit to

ajaeger · ajaeger · commit bf4de8f36758 · 2000-12-31T10:52:32.000Z
avoid warning. 
* io/pwd.c (main): Likewise. 
* iconvdata/tst-table-from.c (main): Likewise. 
* ctype/test_ctype.c (main): Likewise. 
* setjmp/tst-setjmp.c (main): Likewise. 
* signal/tst-signal.c (main): Likewise. 
* stdlib/tst-strtol.c (main): Likewise. 
* stdlib/tst-strtod.c (main): Likewise. 
* stdlib/tst-strtoll.c (main): Likewise. 
* stdlib/tst-xpg-basename.c (main): Likewise. 
* dirent/tst-seekdir.c (main): Likewise. 
* grp/testgrp.c (main): Likewise. 
* inet/test_ifindex.c (main): Likewise. 
* io/test-utime.c (main): Likewise. 
* posix/test-vfork.c (main): Likewise. 
* posix/testfnm.c (main): Likewise. 
* stdio-common/temptest.c (main): Likewise. 
* stdio-common/test_rdwr.c (main): Likewise. 
* stdio-common/tst-fileno.c (main): Likewise. 
* stdio-common/tst-sscanf.c (main): Likewise. 
* stdio-common/tstscanf.c (main): Likewise. 
* string/bug-strncat1.c (main): Likewise. 
* string/bug-strpbrk1.c (main): Likewise. 
* string/bug-strspn1.c (main): Likewise. 
* string/test-ffs.c (main): Likewise. 
* string/tst-inlcall.c (main): Likewise. 
* string/tst-svc.c (main): Likewise. 
* timezone/test-tz.c (main): Likewise. 
* wctype/test_wcfuncs.c (main): Likewise. 
* wctype/test_wctype.c (main): Likewise.
	* stdlib/tst-random.c: Add attribute noreturn to fail.
diff --git a/ctype/test_ctype.c b/ctype/test_ctype.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1994, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1994, 1996, 1997, 2000 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -97,5 +97,5 @@ main (int argc, char **argv)
   TRYEM;
 #undef TRY
 
-  exit (lose ? EXIT_FAILURE : EXIT_SUCCESS);
+  return lose ? EXIT_FAILURE : EXIT_SUCCESS;
 }
diff --git a/dirent/tst-seekdir.c b/dirent/tst-seekdir.c
@@ -38,5 +38,5 @@ main (int argc, char *argv[])
 
 
   closedir (dirp);
-  exit(0);
+  return 0;
 }
diff --git a/grp/testgrp.c b/grp/testgrp.c
@@ -37,5 +37,5 @@ main (int argc, char *argv[])
 	}
     }
 
-  exit (my_passwd && my_group ? EXIT_SUCCESS : EXIT_FAILURE);
+  return my_passwd && my_group ? EXIT_SUCCESS : EXIT_FAILURE;
 }
diff --git a/iconvdata/tst-table-from.c b/iconvdata/tst-table-from.c
@@ -222,5 +222,5 @@ main (int argc, char *argv[])
       exit (1);
     }
 
-  exit (0);
+  return 0;
 }
diff --git a/inet/test_ifindex.c b/inet/test_ifindex.c
@@ -1,5 +1,5 @@
 /* Test interface name <-> index conversions.
-   Copyright (C) 1997 Free Software Foundation, Inc.
+   Copyright (C) 1997, 2000 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Philip Blundell <Philip.Blundell@pobox.com>.
 
@@ -61,5 +61,5 @@ main (void)
       failures += result;
     }
   if_freenameindex (idx);
-  exit (failures ? 1 : 0);
+  return failures ? 1 : 0;
 }
diff --git a/io/pwd.c b/io/pwd.c
@@ -39,5 +39,5 @@ main (void)
       free (dir);
     }
 
-  exit (dir == NULL ? EXIT_FAILURE : EXIT_SUCCESS);
+  return (dir == NULL ? EXIT_FAILURE : EXIT_SUCCESS);
 }
diff --git a/io/test-utime.c b/io/test-utime.c
@@ -37,14 +37,14 @@ main (int argc, char *argv[])
   if (tmpnam (file) == 0)
     {
       perror ("tmpnam");
-      exit (1);
+      return 1;
     }
 
   fd = creat (file, 0666);
   if (fd < 0)
     {
       perror ("creat");
-      exit (1);
+      return 1;
     }
   close (fd);
 
@@ -55,14 +55,14 @@ main (int argc, char *argv[])
     {
       perror ("utime");
       remove (file);
-      exit (1);
+      return 1;
     }
 
   if (stat (file, &st))
     {
       perror ("stat");
       remove (file);
-      exit (1);
+      return 1;
     }
 
   /* Test utime with NULL.
@@ -73,57 +73,57 @@ main (int argc, char *argv[])
     {
       perror ("time");
       remove (file);
-      exit (1);
+      return 1;
     }
 
   if (utime (file, NULL))
     {
       perror ("utime NULL");
       remove (file);
-      exit (1);
+      return 1;
     }
 
   now2 = time (NULL);
   if (now2 == (time_t)-1)
     {
       perror ("time");
       remove (file);
-      exit (1);
+      return 1;
     }
 
   if (stat (file, &stnow))
     {
       perror ("stat");
       remove (file);
-      exit (1);
+      return 1;
     }
 
   remove (file);
 
   if (st.st_mtime != ut.modtime)
     {
       printf ("modtime %ld != %ld\n", st.st_mtime, ut.modtime);
-      exit (1);
+      return 1;
     }
 
   if (st.st_atime != ut.actime)
     {
       printf ("actime %ld != %ld\n", st.st_atime, ut.actime);
-      exit (1);
+      return 1;
     }
 
   if (stnow.st_mtime < now1 || stnow.st_mtime > now2)
     {
       printf ("modtime %ld <%ld >%ld\n", st.st_mtime, now1, now2);
-      exit (1);
+      return 1;
     }
 
   if (stnow.st_atime < now1 || stnow.st_atime > now2)
     {
       printf ("actime %ld <%ld >%ld\n", st.st_atime, now1, now2);
-      exit (1);
+      return 1;
     }
 
   puts ("Test succeeded.");
-  exit (0);
+  return 0;
 }
diff --git a/malloc/memusagestat.c b/malloc/memusagestat.c
@@ -550,7 +550,7 @@ main (int argc, char *argv[])
 
   gdImageDestroy (im_out);
 
-  exit (0);
+  return 0;
 }
 
 
diff --git a/posix/test-vfork.c b/posix/test-vfork.c
@@ -32,7 +32,8 @@ main (void)
   if (waitpid (0, &status, 0) != pid
       || !WIFEXITED (status) || WEXITSTATUS (status) != NR)
     exit (1);
-  exit (0);
+
+  return 0;
 }
 
 void
diff --git a/posix/testfnm.c b/posix/testfnm.c
@@ -77,5 +77,5 @@ main (void)
 	++errors ;
     }
 
-  exit (errors != 0);
+  return errors != 0;
 }
diff --git a/setjmp/tst-setjmp.c b/setjmp/tst-setjmp.c
@@ -113,5 +113,6 @@ main (void)
     puts ("Test FAILED!");
   else
     puts ("Test succeeded!");
-  exit (lose ? EXIT_FAILURE : EXIT_SUCCESS);
+
+  return lose ? EXIT_FAILURE : EXIT_SUCCESS;
 }
diff --git a/signal/tst-signal.c b/signal/tst-signal.c
@@ -39,5 +39,6 @@ main (void)
     }
 
   puts ("Got a signal.  Test succeeded.");
-  exit (EXIT_SUCCESS);
+
+  return EXIT_SUCCESS;
 }
diff --git a/stdio-common/temptest.c b/stdio-common/temptest.c
@@ -24,5 +24,5 @@ main (int argc, char *argv[])
   for (i = 0; i < 500; i++)
     remove (files[i]);
 
-  exit (0);
+  return 0;
 }
diff --git a/stdio-common/test_rdwr.c b/stdio-common/test_rdwr.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1992, 1996, 1997, 1998 Free Software Foundation, Inc.
+/* Copyright (C) 1991,1992,1996,1997,1998,2000 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -125,5 +125,5 @@ main (int argc, char **argv)
       puts ("Test succeeded.");
     }
 
-  exit (lose ? EXIT_FAILURE : EXIT_SUCCESS);
+  return lose ? EXIT_FAILURE : EXIT_SUCCESS;
 }
diff --git a/stdio-common/tst-fileno.c b/stdio-common/tst-fileno.c
@@ -24,14 +24,15 @@ static int
 check (const char *name, FILE *stream, int fd)
 {
   int sfd = fileno (stream);
-  printf ("(fileno (%s) = %d) %c= %d\n", name, sfd, sfd == fd ? '=' : '!', fd);
+  printf ("(fileno (%s) = %d) %c= %d\n", name, sfd,
+	  sfd == fd ? '=' : '!', fd);
   return sfd != fd;
 }
 
 int
 main (void)
 {
-  exit (check ("stdin", stdin, STDIN_FILENO) ||
-	check ("stdout", stdout, STDOUT_FILENO) ||
-	check ("stderr", stderr, STDERR_FILENO));
+  return (check ("stdin", stdin, STDIN_FILENO) ||
+	  check ("stdout", stdout, STDOUT_FILENO) ||
+	  check ("stderr", stderr, STDERR_FILENO));
 }
diff --git a/stdio-common/tst-sscanf.c b/stdio-common/tst-sscanf.c
@@ -117,5 +117,6 @@ main (void)
       if (! tst_locale)
 	break;
     }
-  exit (result);
+
+  return result;
 }
diff --git a/stdio-common/tstscanf.c b/stdio-common/tstscanf.c
@@ -305,5 +305,5 @@ main (int argc, char **argv)
       }
   }
 
-  exit (result);
+  return result;
 }
diff --git a/stdlib/tst-random.c b/stdlib/tst-random.c
@@ -44,7 +44,7 @@ const int nseq = 3;		/* number of test sequences */
 const int nrnd = 50;		/* length of each test sequence */
 const unsigned int seed[3] = { 0x12344321U, 0xEE11DD22U, 0xFEDCBA98 };
 
-void fail (const char *msg, int s, int i);
+void fail (const char *msg, int s, int i) __attribute__ ((__noreturn__));
 
 int
 main (void)
diff --git a/stdlib/tst-strtod.c b/stdlib/tst-strtod.c
@@ -117,7 +117,7 @@ main (int argc, char ** argv)
 
   status |= long_dbl ();
 
-  exit (status ? EXIT_FAILURE : EXIT_SUCCESS);
+  return status ? EXIT_FAILURE : EXIT_SUCCESS;
 }
 
 static void
diff --git a/stdlib/tst-strtol.c b/stdlib/tst-strtol.c
@@ -169,7 +169,7 @@ main (void)
 	}
     }
 
-  exit (status ? EXIT_FAILURE : EXIT_SUCCESS);
+  return status ? EXIT_FAILURE : EXIT_SUCCESS;
 }
 
 static void
diff --git a/stdlib/tst-strtoll.c b/stdlib/tst-strtoll.c
@@ -157,7 +157,7 @@ main (void)
 	}
     }
 
-  exit (status ? EXIT_FAILURE : EXIT_SUCCESS);
+  return status ? EXIT_FAILURE : EXIT_SUCCESS;
 }
 
 static void
diff --git a/stdlib/tst-xpg-basename.c b/stdlib/tst-xpg-basename.c
@@ -63,5 +63,5 @@ main (void)
 	}
     }
 
-  exit (errors);
+  return errors;
 }
diff --git a/string/bug-strncat1.c b/string/bug-strncat1.c
@@ -27,5 +27,5 @@ main (void)
       exit (1);
     }
 
-  exit (0);
+  return 0;
 }
diff --git a/string/bug-strpbrk1.c b/string/bug-strpbrk1.c
@@ -13,7 +13,7 @@ main (void)
 
   strpbrk (b++, "");
   if (b != a + 1)
-    exit (1);
+    return 1;
 
-  exit (0);
+  return 0;
 }
diff --git a/string/bug-strspn1.c b/string/bug-strspn1.c
@@ -13,7 +13,7 @@ main (void)
 
   strspn (b++, "");
   if (b != a + 1)
-    exit (1);
+    return 1;
 
-  exit (0);
+  return 0;
 }
diff --git a/string/test-ffs.c b/string/test-ffs.c
@@ -29,7 +29,7 @@ main (void)
   int i;
 
   auto void try (int value, int expected);
-  
+
   void try (int value, int expected)
     {
       if (ffs (value) != expected)
@@ -52,5 +52,5 @@ main (void)
   else
     puts ("Test succeeded.");
 
-  exit (failures);
+  return failures;
 }
diff --git a/string/tst-inlcall.c b/string/tst-inlcall.c
@@ -1,5 +1,5 @@
 /* Tester for calling inline string functions.
-   Copyright (C) 1998 Free Software Foundation, Inc.
+   Copyright (C) 1998, 2000 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -40,7 +40,7 @@ main (void)
   char buf1[1000];
   char *cp;
   char ch;
-  
+
   cp = strcpy (buf1, "hello world");
   if (strcmp ("hello world", cp++) != 0)
     {
@@ -72,5 +72,5 @@ main (void)
       status = EXIT_FAILURE;
       printf ("%d errors.\n", errors);
     }
-  exit (status);
+  return status;
 }
diff --git a/string/tst-svc.c b/string/tst-svc.c
@@ -41,5 +41,5 @@ main (int argc, char *argv[])
   for (i = 0; i < count; ++i)
     puts (str[i]);
 
-  exit (EXIT_SUCCESS);
+  return EXIT_SUCCESS;
 }
diff --git a/timezone/test-tz.c b/timezone/test-tz.c
@@ -46,11 +46,11 @@ main (int argc, char ** argv)
   if (errors == 0)
     {
       puts ("No errors.");
-      exit (EXIT_SUCCESS);
+      return EXIT_SUCCESS;
     }
   else
     {
       printf ("%d errors.\n", errors);
-      exit (EXIT_FAILURE);
+      return EXIT_FAILURE;
     }
 }
diff --git a/wctype/test_wcfuncs.c b/wctype/test_wcfuncs.c
@@ -84,5 +84,5 @@ main (int argc, char *argv[])
 
   if (result == 0)
     puts ("All test successful!");
-  exit (result);
+  return result != 0;
 }
diff --git a/wctype/test_wctype.c b/wctype/test_wctype.c

Original file line number	Diff line number	Diff line change
`@@ -38,5 +38,5 @@ main (int argc, char *argv[])`
`38`	`38`
`39`	`39`
`40`	`40`	`closedir (dirp);`
`41`		`- exit(0);`
	`41`	`+ return 0;`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,5 +37,5 @@ main (int argc, char *argv[])`
`37`	`37`	`}`
`38`	`38`	`}`
`39`	`39`
`40`		`- exit (my_passwd && my_group ? EXIT_SUCCESS : EXIT_FAILURE);`
	`40`	`+ return my_passwd && my_group ? EXIT_SUCCESS : EXIT_FAILURE;`
`41`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -222,5 +222,5 @@ main (int argc, char *argv[])`
`222`	`222`	`exit (1);`
`223`	`223`	`}`
`224`	`224`
`225`		`- exit (0);`
	`225`	`+ return 0;`
`226`	`226`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/* Test interface name <-> index conversions.`
`2`		`- Copyright (C) 1997 Free Software Foundation, Inc.`
	`2`	`+ Copyright (C) 1997, 2000 Free Software Foundation, Inc.`
`3`	`3`	`This file is part of the GNU C Library.`
`4`	`4`	`Contributed by Philip Blundell <[email protected]>.`
`5`	`5`
`@@ -61,5 +61,5 @@ main (void)`
`61`	`61`	`failures += result;`
`62`	`62`	`}`
`63`	`63`	`if_freenameindex (idx);`
`64`		`- exit (failures ? 1 : 0);`
	`64`	`+ return failures ? 1 : 0;`
`65`	`65`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,5 +39,5 @@ main (void)`
`39`	`39`	`free (dir);`
`40`	`40`	`}`
`41`	`41`
`42`		`- exit (dir == NULL ? EXIT_FAILURE : EXIT_SUCCESS);`
	`42`	`+ return (dir == NULL ? EXIT_FAILURE : EXIT_SUCCESS);`
`43`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,14 +37,14 @@ main (int argc, char *argv[])`
`37`	`37`	`if (tmpnam (file) == 0)`
`38`	`38`	`{`
`39`	`39`	`perror ("tmpnam");`
`40`		`- exit (1);`
	`40`	`+ return 1;`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`fd = creat (file, 0666);`
`44`	`44`	`if (fd < 0)`
`45`	`45`	`{`
`46`	`46`	`perror ("creat");`
`47`		`- exit (1);`
	`47`	`+ return 1;`
`48`	`48`	`}`
`49`	`49`	`close (fd);`
`50`	`50`
`@@ -55,14 +55,14 @@ main (int argc, char *argv[])`
`55`	`55`	`{`
`56`	`56`	`perror ("utime");`
`57`	`57`	`remove (file);`
`58`		`- exit (1);`
	`58`	`+ return 1;`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`if (stat (file, &st))`
`62`	`62`	`{`
`63`	`63`	`perror ("stat");`
`64`	`64`	`remove (file);`
`65`		`- exit (1);`
	`65`	`+ return 1;`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`/* Test utime with NULL.`
`@@ -73,57 +73,57 @@ main (int argc, char *argv[])`
`73`	`73`	`{`
`74`	`74`	`perror ("time");`
`75`	`75`	`remove (file);`
`76`		`- exit (1);`
	`76`	`+ return 1;`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`if (utime (file, NULL))`
`80`	`80`	`{`
`81`	`81`	`perror ("utime NULL");`
`82`	`82`	`remove (file);`
`83`		`- exit (1);`
	`83`	`+ return 1;`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`now2 = time (NULL);`
`87`	`87`	`if (now2 == (time_t)-1)`
`88`	`88`	`{`
`89`	`89`	`perror ("time");`
`90`	`90`	`remove (file);`
`91`		`- exit (1);`
	`91`	`+ return 1;`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`if (stat (file, &stnow))`
`95`	`95`	`{`
`96`	`96`	`perror ("stat");`
`97`	`97`	`remove (file);`
`98`		`- exit (1);`
	`98`	`+ return 1;`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`remove (file);`
`102`	`102`
`103`	`103`	`if (st.st_mtime != ut.modtime)`
`104`	`104`	`{`
`105`	`105`	`printf ("modtime %ld != %ld\n", st.st_mtime, ut.modtime);`
`106`		`- exit (1);`
	`106`	`+ return 1;`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`if (st.st_atime != ut.actime)`
`110`	`110`	`{`
`111`	`111`	`printf ("actime %ld != %ld\n", st.st_atime, ut.actime);`
`112`		`- exit (1);`
	`112`	`+ return 1;`
`113`	`113`	`}`
`114`	`114`
`115`	`115`	`if (stnow.st_mtime < now1 \|\| stnow.st_mtime > now2)`
`116`	`116`	`{`
`117`	`117`	`printf ("modtime %ld <%ld >%ld\n", st.st_mtime, now1, now2);`
`118`		`- exit (1);`
	`118`	`+ return 1;`
`119`	`119`	`}`
`120`	`120`
`121`	`121`	`if (stnow.st_atime < now1 \|\| stnow.st_atime > now2)`
`122`	`122`	`{`
`123`	`123`	`printf ("actime %ld <%ld >%ld\n", st.st_atime, now1, now2);`
`124`		`- exit (1);`
	`124`	`+ return 1;`
`125`	`125`	`}`
`126`	`126`
`127`	`127`	`puts ("Test succeeded.");`
`128`		`- exit (0);`
	`128`	`+ return 0;`
`129`	`129`	`}`
Original file line number	Diff line number	Diff line change
`@@ -550,7 +550,7 @@ main (int argc, char *argv[])`
`550`	`550`
`551`	`551`	`gdImageDestroy (im_out);`
`552`	`552`
`553`		`- exit (0);`
	`553`	`+ return 0;`
`554`	`554`	`}`
`555`	`555`
`556`	`556`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,8 @@ main (void)`
`32`	`32`	`if (waitpid (0, &status, 0) != pid`
`33`	`33`	`\|\| !WIFEXITED (status) \|\| WEXITSTATUS (status) != NR)`
`34`	`34`	`exit (1);`
`35`		`- exit (0);`
	`35`	`+`
	`36`	`+ return 0;`
`36`	`37`	`}`
`37`	`38`
`38`	`39`	`void`
Original file line number	Diff line number	Diff line change
`@@ -77,5 +77,5 @@ main (void)`
`77`	`77`	`++errors ;`
`78`	`78`	`}`
`79`	`79`
`80`		`- exit (errors != 0);`
	`80`	`+ return errors != 0;`
`81`	`81`	`}`
Original file line number	Diff line number	Diff line change
`@@ -113,5 +113,6 @@ main (void)`
`113`	`113`	`puts ("Test FAILED!");`
`114`	`114`	`else`
`115`	`115`	`puts ("Test succeeded!");`
`116`		`- exit (lose ? EXIT_FAILURE : EXIT_SUCCESS);`
	`116`	`+`
	`117`	`+ return lose ? EXIT_FAILURE : EXIT_SUCCESS;`
`117`	`118`	`}`