util-serverlog-inclusion-and-warnings-cleanup-20010711

change how string/strings include files happen, remove unused vars

diff --git a/src/util/serverLog.c b/src/util/serverLog.c
index 68c8ae380b99c01d7f9d71cc735f259355f48186..49eeb126e26a3fc1fcec54948df25a2de3d7d7fa 100644 (file)
--- a/src/util/serverLog.c
+++ b/src/util/serverLog.c
@@ -36,10 +36,12 @@ RCSID("$Header$");
 #include <afs/procmgmt.h>  /* signal(), kill(), wait(), etc. */
 #include <fcntl.h>
 #include <afs/stds.h>
-#if defined(AFS_SUN5_ENV) || defined(AFS_NT40_ENV)
-#include <string.h>
-#else
+#ifdef HAVE_STRINGS_H
 #include <strings.h>
+#else
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
 #endif
 #include "afsutil.h"
 #include "fileutil.h"
@@ -100,7 +102,6 @@ void FSLog (const char *format, ...)
     char tbuffer[1024];
     char *info;
     int len;
-    int i;
     char *name;
 
     currenttime = time(0);
@@ -137,13 +138,14 @@ void FSLog (const char *format, ...)
 #endif
 }
 
-static void DebugOn(int loglevel)
+static int DebugOn(int loglevel)
 {
     if (loglevel == 0) {
         ViceLog(0, ("Reset Debug levels to 0\n"));
     } else {
         ViceLog(0, ("Set Debug On level = %d\n",loglevel));
     }
+    return 0;
 } /*DebugOn*/
 
 
@@ -177,7 +179,7 @@ void ResetDebug_Signal(int signo)
 #if defined(AFS_PTHREAD_ENV)
     DebugOn(LogLevel);
 #else /* AFS_PTHREAD_ENV */
-    IOMGR_SoftSig(DebugOn, LogLevel);
+    IOMGR_SoftSig(DebugOn, (void *)LogLevel);
 #endif /* AFS_PTHREAD_ENV */
 
     signal(signo, ResetDebug_Signal);   /* on some platforms, this signal */
@@ -209,7 +211,7 @@ int OpenLog(const char *fileName)
 #ifndef AFS_NT40_ENV
     if ( serverLogSyslog ) {
        openlog(NULL, LOG_PID, serverLogSyslogFacility);
-       return;
+       return(0);
     }
 #endif