From 8fc6b23e8b41f2dc635b9188ce2d2ef2f6032d0c Mon Sep 17 00:00:00 2001
From: Simon Wilkinson <sxw@inf.ed.ac.uk>
Date: Wed, 31 Oct 2007 12:36:03 +0000
Subject: [PATCH] STABLE14-util-cleanup-20071031

kill the warnings in src/util
---
 src/util/afsutil.h            | 2 +-
 src/util/afsutil_prototypes.h | 2 +-
 src/util/assert.c             | 2 +-
 src/util/netutils.c           | 3 +++
 src/util/serverLog.c          | 7 ++-----
 src/util/softsig.c            | 1 +
 src/util/strlcat.c            | 1 +
 src/util/sys.c                | 2 +-
 8 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/util/afsutil.h b/src/util/afsutil.h
index 3d074152a..3a036134d 100644
--- a/src/util/afsutil.h
+++ b/src/util/afsutil.h
@@ -40,7 +40,7 @@ extern int serverLogSyslogFacility;
 extern char *serverLogSyslogTag;
 #endif
 extern void vFSLog(const char *format, va_list args);
-extern void SetLogThreadNumProgram(int (*func) () );
+extern void SetLogThreadNumProgram(int (*func) (void) );
 
 /*@printflike@*/ extern void FSLog(const char *format, ...);
 #define ViceLog(level, str)  if ((level) <= LogLevel) (FSLog str)
diff --git a/src/util/afsutil_prototypes.h b/src/util/afsutil_prototypes.h
index fbfc35f40..ab597783f 100644
--- a/src/util/afsutil_prototypes.h
+++ b/src/util/afsutil_prototypes.h
@@ -159,7 +159,7 @@ extern void ResetDebug_Signal(int signo);
 extern void SetupLogSignals(void);
 extern int OpenLog(const char *fileName);
 extern int ReOpenLog(const char *fileName);
-extern int LogThreadNum();
+extern int LogThreadNum(void);
 
 /* snprintf.c */
 
diff --git a/src/util/assert.c b/src/util/assert.c
index abfa6cae9..a6b5ba782 100644
--- a/src/util/assert.c
+++ b/src/util/assert.c
@@ -38,7 +38,7 @@ AssertionFailed(char *file, int line)
     time_t when;
 
     time(&when);
-    afs_ctime(&when, tdate, 25);
+    (void)afs_ctime(&when, tdate, 25);
     fprintf(stderr, "%s: Assertion failed! file %s, line %d.\n", tdate, file,
 	    line);
     fflush(stderr);
diff --git a/src/util/netutils.c b/src/util/netutils.c
index ab1734499..63d2995d4 100644
--- a/src/util/netutils.c
+++ b/src/util/netutils.c
@@ -51,6 +51,9 @@ RCSID
 #define INADDR_LOOPBACK (afs_uint32)0x7f000001
 #endif
 
+int ParseNetInfoFile_int(afs_uint32 *, afs_uint32 *, afs_uint32 *,
+                         int, char reason[], const char *,
+                         int);
 /* 
  * The line parameter is a pointer to a buffer containing a string of 
  * bytes of the form 
diff --git a/src/util/serverLog.c b/src/util/serverLog.c
index bfd09983a..cf2653c24 100644
--- a/src/util/serverLog.c
+++ b/src/util/serverLog.c
@@ -69,7 +69,7 @@ dummyThreadNum(void)
 {
     return -1;
 }
-static int (*threadNumProgram) () = dummyThreadNum;
+static int (*threadNumProgram) (void) = dummyThreadNum;
 
 static int serverLogFD = -1;
 
@@ -87,7 +87,7 @@ int printLocks = 0;
 static char ourName[MAXPATHLEN];
 
 void
-SetLogThreadNumProgram(int (*func) () )
+SetLogThreadNumProgram(int (*func) (void) )
 {
     threadNumProgram = func;
 }
@@ -333,9 +333,6 @@ int
 ReOpenLog(const char *fileName)
 {
     int isfifo = 0;
-#if !defined(AFS_PTHREAD_ENV)
-    int tempfd;
-#endif
 #if !defined(AFS_NT40_ENV)
     struct stat statbuf;
 #endif
diff --git a/src/util/softsig.c b/src/util/softsig.c
index ac7ae1cc6..98c04cf49 100644
--- a/src/util/softsig.c
+++ b/src/util/softsig.c
@@ -15,6 +15,7 @@
 #define _POSIX_PTHREAD_SEMANTICS
 #include <afs/param.h>
 #include <assert.h>
+#include <stdlib.h>
 #include <stdio.h>
 #ifndef  AFS_NT40_ENV
 #include <signal.h>
diff --git a/src/util/strlcat.c b/src/util/strlcat.c
index 238e33e6f..f9de8449e 100644
--- a/src/util/strlcat.c
+++ b/src/util/strlcat.c
@@ -23,6 +23,7 @@ RCSID
 #ifndef HAVE_STRLCAT
 
 #include <sys/types.h>
+#include <string.h>
 
 /*
  * Appends src to string dst of size siz (unlike strncat, siz is the
diff --git a/src/util/sys.c b/src/util/sys.c
index 1930fba54..40f18d868 100644
--- a/src/util/sys.c
+++ b/src/util/sys.c
@@ -18,7 +18,7 @@ RCSID
 #include "AFS_component_version_number.c"
 
 int
-main()
+main(int argc, char **argv)
 {
     printf("%s\n", SYS_NAME);
     return 0;
-- 
2.39.5