6272055 gcc and cmd/nscd don't get along

6310582 gcc and sparc sysinfo don't get along

8 files changed, 30 insertions, 25 deletions

diff --git a/usr/src/cmd/nscd/getexec.c b/usr/src/cmd/nscd/getexec.c
index d69f994352..8abb15723e 100644
--- a/usr/src/cmd/nscd/getexec.c
+++ b/usr/src/cmd/nscd/getexec.c
@@ -20,7 +20,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -61,7 +61,7 @@ static hash_t *nam_hash;
 static mutex_t  db_lock = DEFAULTMUTEX;
 static waiter_t db_wait;
 
-static getexec_namekeepalive(int keep, int interval);
+static int getexec_namekeepalive(int keep, int interval);
 static int update_exec_bucket(nsc_bucket_t **old, nsc_bucket_t *new,
     int callnumber);
 static nsc_bucket_t *fixbuffer(nsc_return_t *in, int maxlen);
@@ -125,7 +125,7 @@ getexec_revalidate(void)
 	}
 }
 
-static
+static int
 getexec_namekeepalive(int keep, int interval)
 {
 	int *table;
diff --git a/usr/src/cmd/nscd/nscd.h b/usr/src/cmd/nscd/nscd.h
index 83f85a6b16..a7dab9fd90 100644
--- a/usr/src/cmd/nscd/nscd.h
+++ b/usr/src/cmd/nscd/nscd.h
@@ -119,6 +119,7 @@ extern void getuser_invalidate(void);
 extern void getuser_lookup(nsc_return_t *out, int maxsize, nsc_call_t *in,
     time_t now);
 
+extern void leave(int n);
 #ifdef	__cplusplus
 }
 #endif
diff --git a/usr/src/cmd/nscd/nscd_biggest.c b/usr/src/cmd/nscd/nscd_biggest.c
index 199471d061..7ddfda863e 100644
--- a/usr/src/cmd/nscd/nscd_biggest.c
+++ b/usr/src/cmd/nscd/nscd_biggest.c
@@ -20,8 +20,8 @@
  * CDDL HEADER END
  */
 /*
- * Copyright (c) 1994 by Sun Microsystems, Inc.
- * All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
  */
 
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
@@ -47,6 +47,7 @@ maken(int n)
 	return (ret);
 }
 
+int
 insertn(int * table, int n, int data)
 {
 	int size = *table;
diff --git a/usr/src/cmd/nscd/nscd_nischeck.c b/usr/src/cmd/nscd/nscd_nischeck.c
index f6b43de468..287426d4bf 100644
--- a/usr/src/cmd/nscd/nscd_nischeck.c
+++ b/usr/src/cmd/nscd/nscd_nischeck.c
@@ -20,8 +20,8 @@
  * CDDL HEADER END
  */
 /*
- * Copyright (c) 1994 by Sun Microsystems, Inc.
- * All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
  */
 
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
@@ -41,8 +41,9 @@
 #include <rpc/rpc.h>
 #include <rpcsvc/nis.h>
 #include <unistd.h>
-extern int 	optind;
-extern char	*optarg;
+
+void
+leave(int n);
 
 int
 check_col(struct nis_object *table, int col)
@@ -84,8 +85,10 @@ main(int argc, char **argv)
 	}
 
 	leave(0);
+	return (0);
 }
 
+void
 leave(int n)
 {
 	if(getenv("NSCD_DEBUG"))
diff --git a/usr/src/cmd/nscd/nscd_wait.c b/usr/src/cmd/nscd/nscd_wait.c
index b73aaf05c9..b5af46749e 100644
--- a/usr/src/cmd/nscd/nscd_wait.c
+++ b/usr/src/cmd/nscd/nscd_wait.c
@@ -20,8 +20,8 @@
  * CDDL HEADER END
  */
 /*
- * Copyright (c) 1994 by Sun Microsystems, Inc.
- * All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
  */
 
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
@@ -148,5 +148,5 @@ void * go(int index)
 }
 
 		
-#endif TESTPROG
+#endif /* TESTPROG */
 	
diff --git a/usr/src/cmd/nscd/server.c b/usr/src/cmd/nscd/server.c
index 3adfd88dc5..349666a8a6 100644
--- a/usr/src/cmd/nscd/server.c
+++ b/usr/src/cmd/nscd/server.c
@@ -459,7 +459,7 @@ save_execname()
 	strlcat(saved_execname, name, MAXPATHLEN);
 }
 
-void
+int
 main(int argc, char ** argv)
 {
 	int did;
@@ -968,7 +968,7 @@ main(int argc, char ** argv)
 
 	if (thr_sigsetmask(SIG_UNBLOCK, &myset, NULL) < 0) {
 		perror("thr_sigsetmask");
-		exit(1);
+		return (1);
 	}
 
 	for (;;) {
diff --git a/usr/src/uts/sun4u/os/fillsysinfo.c b/usr/src/uts/sun4u/os/fillsysinfo.c
index 479f9ed627..700a61c9eb 100644
--- a/usr/src/uts/sun4u/os/fillsysinfo.c
+++ b/usr/src/uts/sun4u/os/fillsysinfo.c
@@ -335,9 +335,9 @@ fill_address(dnode_t curnode, char *namep)
 			}
 
 			/* make into a native pointer */
-			*wkp->wk_vaddrp = (caddr_t)vaddr;
+			*wkp->wk_vaddrp = (caddr_t)(uintptr_t)vaddr;
 #ifdef VPRINTF
-			VPRINTF("fill_address: %s mapped to %x\n", namep,
+			VPRINTF("fill_address: %s mapped to %p\n", namep,
 			    *wkp->wk_vaddrp);
 #endif /* VPRINTF */
 		}
@@ -1064,11 +1064,11 @@ have_eeprom(dnode_t node)
 	 * If we have a chosen eeprom and it is not this node, keep looking.
 	 */
 	if (chosen_eeprom != NULL && chosen_eeprom != node) {
-		v_timecheck_addr = (caddr_t)eaddr;
+		v_timecheck_addr = (caddr_t)(uintptr_t)eaddr;
 		return;
 	}
 
-	v_eeprom_addr = (caddr_t)eaddr;
+	v_eeprom_addr = (caddr_t)(uintptr_t)eaddr;
 
 	/*
 	 * If we don't find an I/O board to use to check the clock,
@@ -1117,8 +1117,8 @@ have_rtc(dnode_t node)
 	if (GETPROP(node, OBP_ADDRESS, (caddr_t)&eaddr) == -1)
 		cmn_err(CE_PANIC, "rtc addr");
 
-	v_rtc_addr_reg = (caddr_t)eaddr;
-	v_rtc_data_reg = (volatile unsigned char *)eaddr + 1;
+	v_rtc_addr_reg = (caddr_t)(uintptr_t)eaddr;
+	v_rtc_data_reg = (volatile unsigned char *)(uintptr_t)eaddr + 1;
 
 	/*
 	 * Does this rtc have watchdog support?
@@ -1148,8 +1148,8 @@ have_pmc(dnode_t node)
 			watchdog_available = 0;
 			return;
 		}
-		v_pmc_addr_reg = (volatile uint8_t *)vaddr;
-		v_pmc_data_reg = (volatile uint8_t *)vaddr + 1;
+		v_pmc_addr_reg = (volatile uint8_t *)(uintptr_t)vaddr;
+		v_pmc_data_reg = (volatile uint8_t *)(uintptr_t)vaddr + 1;
 		watchdog_available = 1;
 	}
 }
@@ -1185,7 +1185,7 @@ have_auxio(dnode_t node)
 	if (GETPROP(node, OBP_ADDRESS, (caddr_t)addr) == -1)
 		cmn_err(CE_PANIC, "auxio addr");
 
-	v_auxio_addr = (caddr_t)addr[0];	/* make into a C pointer */
+	v_auxio_addr = (caddr_t)(uintptr_t)(addr[0]); /* make into pointer */
 }
 
 static void
diff --git a/usr/src/uts/sun4v/os/fillsysinfo.c b/usr/src/uts/sun4v/os/fillsysinfo.c
index e4ff6ff702..80297ac315 100644
--- a/usr/src/uts/sun4v/os/fillsysinfo.c
+++ b/usr/src/uts/sun4v/os/fillsysinfo.c
@@ -281,9 +281,9 @@ fill_address(dnode_t curnode, char *namep)
 			}
 
 			/* make into a native pointer */
-			*wkp->wk_vaddrp = (caddr_t)vaddr;
+			*wkp->wk_vaddrp = (caddr_t)(uintptr_t)vaddr;
 #ifdef VPRINTF
-			VPRINTF("fill_address: %s mapped to %x\n", namep,
+			VPRINTF("fill_address: %s mapped to %p\n", namep,
 			    *wkp->wk_vaddrp);
 #endif /* VPRINTF */
 		}