From d588a44fc660e65836b48fa297937db217d675b3 Mon Sep 17 00:00:00 2001
From: Peter Breitenlohner <peb@mppmu.mpg.de>
Date: Wed, 2 Jul 2003 01:44:37 +0000
Subject: [PATCH] STABLE12-gcc-warnings-cleanup-20030701

FIXES 1650

gcc warnings cleanup; add headers, fix castings


(cherry picked from commit 88e2d8e292e687d3193dcaff62ffd5f2ab4f72ad)
---
 src/afsd/afsd.c          |  2 +-
 src/bozo/bos_util.c      |  2 +-
 src/sys/rmtsysc.c        |  3 +++
 src/uss/uss_common.h     |  8 ++++++++
 src/util/potpourri.h     |  1 +
 src/venus/kdump.c        |  2 +-
 src/venus/test/owntest.c |  4 ++--
 src/venus/up.c           | 14 +++++++-------
 src/vlserver/cnvldb.c    | 14 +++++++-------
 9 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/src/afsd/afsd.c b/src/afsd/afsd.c
index a9ec41dbc..cdf9bfa76 100644
--- a/src/afsd/afsd.c
+++ b/src/afsd/afsd.c
@@ -2088,7 +2088,7 @@ long param1, param2, param3, param4, param5, param6, param7;
     eparm[2] = param6;
     eparm[3] = param7;
 
-    param4 = eparm;
+    param4 = (long) eparm;
 #endif
 
     error = syscall(AFS_SYSCALL, AFSCALL_CALL, param1, param2, param3, param4, param5, param6, param7);
diff --git a/src/bozo/bos_util.c b/src/bozo/bos_util.c
index 17152aa51..951626e4a 100644
--- a/src/bozo/bos_util.c
+++ b/src/bozo/bos_util.c
@@ -187,7 +187,7 @@ main(int argc, char **argv)
 		printf("kvno %4d: key is '%s' '", tkeys.key[i].kvno, tbuffer);
 		strcpy(x,(char *)tbuffer);
 		for(count=0;count<8;count++)
-		    printf("\\%03o",(unsigned char *)x[count]);
+		    printf("\\%03o", x[count]);
 		printf("'\n");
 	    }
 	}
diff --git a/src/sys/rmtsysc.c b/src/sys/rmtsysc.c
index ba003f24a..0ad1f2e81 100644
--- a/src/sys/rmtsysc.c
+++ b/src/sys/rmtsysc.c
@@ -33,6 +33,9 @@ RCSID("$Header$");
 #ifdef HAVE_STRING_H
 #include <string.h>
 #endif
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
 #include <rx/xdr.h>
 #include "rmtsys.h"
 
diff --git a/src/uss/uss_common.h b/src/uss/uss_common.h
index aeb8201ea..7477e61e9 100644
--- a/src/uss/uss_common.h
+++ b/src/uss/uss_common.h
@@ -23,6 +23,14 @@
 #include <stdio.h>		/*I/O stuff*/
 #include <afs/afsutil.h>
 #include <errno.h>
+#ifdef HAVE_STRING_H
+#include <string.h>
+#else
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
+#endif
+
 
 /*
  * --------------------- Exported definitions ---------------------
diff --git a/src/util/potpourri.h b/src/util/potpourri.h
index 3d7bb8685..9849e3ecd 100644
--- a/src/util/potpourri.h
+++ b/src/util/potpourri.h
@@ -92,6 +92,7 @@ Abstract:	Contains miscellaneous general-purpose macros.
 	BEWARE:  avoid quotes in the assertion!!
 	Also beware: you cannot make the NOASSERT case a null macro, because of side effects */
 
+#undef assert
 #ifndef NOASSERT
 #define assert(ex) {if (!(ex)){fprintf(stderr,"Assertion failed: file %s, line %d\n", __FILE__, __LINE__);fprintf(stderr, "\t%s\n", # ex); abort();}}
 #else
diff --git a/src/venus/kdump.c b/src/venus/kdump.c
index debfd8c21..be62147c7 100644
--- a/src/venus/kdump.c
+++ b/src/venus/kdump.c
@@ -53,7 +53,7 @@ struct ntfs_inode_info{};
 #define u16 unsigned short
 #include <features.h>
 #if __GLIBC_MINOR__ >= 2
-#define _SYS_TYPES_H
+#define _SYS_TYPES_H 1
 #endif
 #define __KERNEL__
 #endif
diff --git a/src/venus/test/owntest.c b/src/venus/test/owntest.c
index f894c7c4f..0a9c44a34 100644
--- a/src/venus/test/owntest.c
+++ b/src/venus/test/owntest.c
@@ -45,8 +45,8 @@ char **argv; {
         perror("chmod back to RW");
         return 1;
     }
-    gettimeofday(&tv[0], (char *) 0);
-    gettimeofday(&tv[1], (char *) 0);
+    gettimeofday(&tv[0], (void *) 0);
+    gettimeofday(&tv[1], (void *) 0);
     tv[0].tv_sec -= 10000;
     tv[0].tv_usec = 0;
     tv[1].tv_sec -= 20000;
diff --git a/src/venus/up.c b/src/venus/up.c
index 275c5e7e2..aeade8f00 100644
--- a/src/venus/up.c
+++ b/src/venus/up.c
@@ -18,6 +18,13 @@ RCSID("$Header$");
 #define false 0
 
 #include <errno.h>
+#ifdef HAVE_STRING_H
+#include <string.h>
+#else
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
+#endif
 #ifdef	AFS_AIX32_ENV
 #include <signal.h>
 #undef	_NONSTD_TYPES
@@ -44,13 +51,6 @@ RCSID("$Header$");
 #include <netinet/in.h>
 #endif
 #include <afs/venus.h>
-#ifdef HAVE_STRING_H
-#include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 
 /* ************************************************************* */
 
diff --git a/src/vlserver/cnvldb.c b/src/vlserver/cnvldb.c
index 9f5587249..991a1419e 100644
--- a/src/vlserver/cnvldb.c
+++ b/src/vlserver/cnvldb.c
@@ -17,6 +17,13 @@ RCSID("$Header$");
 #include <errno.h>
 #include <stdio.h>
 #include <sys/file.h>
+#ifdef HAVE_STRING_H
+#include <string.h>
+#else
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
+#endif
 #include "cnvldb.h"  /* CHANGEME! */
 #include <netinet/in.h>
 #include <afs/venus.h>
@@ -25,13 +32,6 @@ RCSID("$Header$");
 #include <afs/fileutil.h>
 
 #include "vlserver.h"
-#ifdef HAVE_STRING_H
-#include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 
 #define MAXSIZE 2048 /* most I'll get back from PIOCTL */
 #define	BADSERVERID	255	/* XXX */
-- 
2.39.5