Make syslogd.c, init.c, and update.c compile error/warning free under both libc5...

 -Erik

diff --git a/init.c b/init.c
index 0e126104b451c9442bf844aa996e0fc939194dfa..98a58f275edc55d568663525546a78c11aeecd29 100644 (file)
--- a/init.c
+++ b/init.c
@@ -93,7 +93,7 @@
 #if defined(__GLIBC__)
 #include <sys/kdaemon.h>
 #else
-_syscall2(int, bdflush, int, func, int, data);
+static _syscall2(int, bdflush, int, func, int, data);
 #endif                                                 /* __GLIBC__ */
 
 

diff --git a/init/init.c b/init/init.c
index 0e126104b451c9442bf844aa996e0fc939194dfa..98a58f275edc55d568663525546a78c11aeecd29 100644 (file)
--- a/init/init.c
+++ b/init/init.c
@@ -93,7 +93,7 @@
 #if defined(__GLIBC__)
 #include <sys/kdaemon.h>
 #else
-_syscall2(int, bdflush, int, func, int, data);
+static _syscall2(int, bdflush, int, func, int, data);
 #endif                                                 /* __GLIBC__ */
 
 

diff --git a/miscutils/update.c b/miscutils/update.c
index 14f1d3c2081dcfaa3268b167a55f72fe821665f3..b86d84e06680087f0db50ae6eb5689812a4fd4fc 100644 (file)
--- a/miscutils/update.c
+++ b/miscutils/update.c
@@ -28,12 +28,14 @@
 #include <sys/param.h>
 #include <sys/syslog.h>
 
+
 #if defined(__GLIBC__)
 #include <sys/kdaemon.h>
 #else
-_syscall2(int, bdflush, int, func, int, data);
+static _syscall2(int, bdflush, int, func, int, data);
 #endif                                                 /* __GLIBC__ */
 
+
 static char update_usage[] =
        "update [options]\n"
 #ifndef BB_FEATURE_TRIVIAL_HELP
@@ -109,7 +111,7 @@ extern int update_main(int argc, char **argv)
                        }
                }
        }
-       exit( TRUE);
+       return( TRUE);
 }
 
 /*

diff --git a/sysklogd/syslogd.c b/sysklogd/syslogd.c
index d2fbc3d876eb8ce3e7759903ce497614b5f41361..f4e7f459b537376758096f0aab3cfddb7d0daa5b 100644 (file)
--- a/sysklogd/syslogd.c
+++ b/sysklogd/syslogd.c
@@ -42,12 +42,10 @@
 #include <sys/param.h>
 #include <linux/unistd.h>
 
-#ifndef socklen_t
-typedef unsigned int socklen_t;
-#endif
-
 #if __GNU_LIBRARY__ < 5
 
+typedef unsigned int socklen_t;
+
 #ifndef __alpha__
 # define __NR_klogctl __NR_syslog
 static inline _syscall3(int, klogctl, int, type, char *, b, int, len);

diff --git a/syslogd.c b/syslogd.c
index d2fbc3d876eb8ce3e7759903ce497614b5f41361..f4e7f459b537376758096f0aab3cfddb7d0daa5b 100644 (file)
--- a/syslogd.c
+++ b/syslogd.c
@@ -42,12 +42,10 @@
 #include <sys/param.h>
 #include <linux/unistd.h>
 
-#ifndef socklen_t
-typedef unsigned int socklen_t;
-#endif
-
 #if __GNU_LIBRARY__ < 5
 
+typedef unsigned int socklen_t;
+
 #ifndef __alpha__
 # define __NR_klogctl __NR_syslog
 static inline _syscall3(int, klogctl, int, type, char *, b, int, len);

diff --git a/update.c b/update.c
index 14f1d3c2081dcfaa3268b167a55f72fe821665f3..b86d84e06680087f0db50ae6eb5689812a4fd4fc 100644 (file)
--- a/update.c
+++ b/update.c
@@ -28,12 +28,14 @@
 #include <sys/param.h>
 #include <sys/syslog.h>
 
+
 #if defined(__GLIBC__)
 #include <sys/kdaemon.h>
 #else
-_syscall2(int, bdflush, int, func, int, data);
+static _syscall2(int, bdflush, int, func, int, data);
 #endif                                                 /* __GLIBC__ */
 
+
 static char update_usage[] =
        "update [options]\n"
 #ifndef BB_FEATURE_TRIVIAL_HELP
@@ -109,7 +111,7 @@ extern int update_main(int argc, char **argv)
                        }
                }
        }
-       exit( TRUE);
+       return( TRUE);
 }
 
 /*