diff --git a/ChangeLog b/ChangeLog
index 9515f77a7c..9a1b81c4aa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2000-12-05  Andreas Jaeger  <aj@suse.de>
+
+	* nss/test-netdb.c: Mark local functions as static to avoid
+	warnings.
+	(main): Use return to silence warning.
+
+	* stdlib/test-canon.c (check_path): Mark as static to avoid warning.
+
+	* stdio-common/test-popen.c: Mark local functions as static to
+	avoid warnings.
+	(main): Use return to silence warning.
+
+	* stdlib/testsort.c (compare): Mark as static to avoid warning.
+
+	* assert/test-assert.c: Mark local functions as static to avoid
+	warnings.
+	* assert/test-assert-perr.c: Likewise.
+
+	* math/libm-test.inc (main): Use return to silence warnings.
+
 2000-12-04  Ulrich Drepper  <drepper@redhat.com>
 
 	* math/fenv.h: Fix typo in comment.
diff --git a/assert/test-assert-perr.c b/assert/test-assert-perr.c
index 824c1a9f97..8496db6ffd 100644
--- a/assert/test-assert-perr.c
+++ b/assert/test-assert-perr.c
@@ -14,7 +14,7 @@
 jmp_buf rec;
 char buf[160];
 
-void
+static void
 sigabrt (int unused)
 {
   longjmp (rec, 1);  /* recover control */
@@ -22,13 +22,13 @@ sigabrt (int unused)
 
 #undef NDEBUG
 #include <assert.h>
-void
+static void
 assert1 (void)
 {
   assert_perror (1);
 }
 
-void
+static void
 assert2 (void)
 {
   assert_perror (0);
@@ -36,7 +36,7 @@ assert2 (void)
 
 #define NDEBUG
 #include <assert.h>
-void
+static void
 assert3 (void)
 {
   assert_perror (2);
diff --git a/assert/test-assert.c b/assert/test-assert.c
index 045721e9cd..26b58d4dd3 100644
--- a/assert/test-assert.c
+++ b/assert/test-assert.c
@@ -14,7 +14,7 @@
 jmp_buf rec;
 char buf[160];
 
-void
+static void
 sigabrt (int unused)
 {
   longjmp (rec, 1);  /* recover control */
@@ -22,13 +22,13 @@ sigabrt (int unused)
 
 #undef NDEBUG
 #include <assert.h>
-void
+static void
 assert1 (void)
 {
   assert (1 == 2);
 }
 
-void
+static void
 assert2 (void)
 {
   assert (1 == 1);
@@ -37,7 +37,7 @@ assert2 (void)
 
 #define NDEBUG
 #include <assert.h>
-void
+static void
 assert3 (void)
 {
   assert (2 == 3);
diff --git a/math/libm-test.inc b/math/libm-test.inc
index 5ec089ccc0..e923795b90 100644
--- a/math/libm-test.inc
+++ b/math/libm-test.inc
@@ -4401,10 +4401,11 @@ main (int argc, char **argv)
   if (noErrors)
     {
       printf ("  %d errors occured.\n", noErrors);
-      exit (1);
+      return 1;
     }
   printf ("  All tests passed successfully.\n");
-  exit (0);
+
+  return 0;
 }
 
 /*
diff --git a/stdio-common/test-popen.c b/stdio-common/test-popen.c
index aced45d5c9..5947e93a67 100644
--- a/stdio-common/test-popen.c
+++ b/stdio-common/test-popen.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997, 1998 Free Software Foundation, Inc.
+/* Copyright (C) 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
@@ -20,7 +20,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-void
+static void
 write_data (FILE *stream)
 {
   int i;
@@ -33,7 +33,7 @@ write_data (FILE *stream)
     }
 }
 
-void
+static void
 read_data (FILE *stream)
 {
   int i, j;
@@ -99,5 +99,5 @@ main (void)
     }
 
   puts (wstatus | rstatus  ? "Test FAILED!" : "Test succeeded.");
-  exit (wstatus | rstatus);
+  return (wstatus | rstatus);
 }
diff --git a/stdlib/test-canon.c b/stdlib/test-canon.c
index 2ece136435..596de7d488 100644
--- a/stdlib/test-canon.c
+++ b/stdlib/test-canon.c
@@ -93,7 +93,7 @@ struct {
 };
 
 
-int
+static int
 check_path (const char * result, const char * expected)
 {
   int good;
diff --git a/stdlib/testsort.c b/stdlib/testsort.c
index a9a43c76ea..aa4332a568 100644
--- a/stdlib/testsort.c
+++ b/stdlib/testsort.c
@@ -2,7 +2,7 @@
 #include <string.h>
 #include <stdio.h>
 
-int
+static int
 compare (const void *a, const void *b)
 {
   return strcmp (*(char **) a, *(char **) b);