6554130 rpld function incoming() does not have correct return values leading to Studio 12 build failures

6554132 mdb's genunix module overloads the "sys/panic.h" variables causing Studio 12 build to fail

2 files changed, 16 insertions, 18 deletions

diff --git a/usr/src/cmd/mdb/common/modules/genunix/genunix.c b/usr/src/cmd/mdb/common/modules/genunix/genunix.c
index 51bebaedf5..22505699cd 100644
--- a/usr/src/cmd/mdb/common/modules/genunix/genunix.c
+++ b/usr/src/cmd/mdb/common/modules/genunix/genunix.c
@@ -3181,7 +3181,7 @@ panicinfo(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 {
 	cpu_t panic_cpu;
 	kthread_t *panic_thread;
-	void *panicbuf;
+	void *buf;
 	panic_data_t *pd;
 	int i, n;
 
@@ -3204,17 +3204,17 @@ panicinfo(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 	else
 		mdb_printf("%16s %?p\n", "thread", panic_thread);
 
-	panicbuf = mdb_alloc(PANICBUFSIZE, UM_SLEEP);
-	pd = (panic_data_t *)panicbuf;
+	buf = mdb_alloc(PANICBUFSIZE, UM_SLEEP);
+	pd = (panic_data_t *)buf;
 
-	if (mdb_readsym(panicbuf, PANICBUFSIZE, "panicbuf") == -1 ||
+	if (mdb_readsym(buf, PANICBUFSIZE, "panicbuf") == -1 ||
 	    pd->pd_version != PANICBUFVERS) {
 		mdb_warn("failed to read 'panicbuf'");
-		mdb_free(panicbuf, PANICBUFSIZE);
+		mdb_free(buf, PANICBUFSIZE);
 		return (DCMD_ERR);
 	}
 
-	mdb_printf("%16s %s\n", "message",  (char *)panicbuf + pd->pd_msgoff);
+	mdb_printf("%16s %s\n", "message",  (char *)buf + pd->pd_msgoff);
 
 	n = (pd->pd_msgoff - (sizeof (panic_data_t) -
 	    sizeof (panic_nv_t))) / sizeof (panic_nv_t);
@@ -3223,7 +3223,7 @@ panicinfo(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 		mdb_printf("%16s %?llx\n",
 		    pd->pd_nvdata[i].pnv_name, pd->pd_nvdata[i].pnv_value);
 
-	mdb_free(panicbuf, PANICBUFSIZE);
+	mdb_free(buf, PANICBUFSIZE);
 	return (DCMD_OK);
 }
 
diff --git a/usr/src/cmd/rpld/rplin.c b/usr/src/cmd/rpld/rplin.c
index 399c5224ab..02278e95b5 100644
--- a/usr/src/cmd/rpld/rplin.c
+++ b/usr/src/cmd/rpld/rplin.c
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -19,7 +18,7 @@
  *
  * CDDL HEADER END
  *
- * Copyright 2000 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -62,7 +61,7 @@ char	b[20];
 	flags = 0;
 	if (getmsg(fd, &ctl, &data, &flags) < 0) {
 		perror("getmsg in incoming\n");
-		return(-1);
+		return (-1);
 	}
 	/*
 	dumpctl(&ctl);
@@ -80,7 +79,7 @@ char	b[20];
 				sprintf(debugmsg, "Client failed validation\n");
 				senddebug(MSG_WARN_2);
 			}
-			return;
+			return (0);
 		}
 		break;
 	case CMD_SEND_FILE:
@@ -93,7 +92,7 @@ char	b[20];
 				sprintf(debugmsg, "Unknown client request to SEND FILE\n");
 				senddebug(MSG_WARN_2);
 			}
-			return;
+			return (0);
 		}
 
 		switch (cp->status) {
@@ -154,7 +153,7 @@ char	b[20];
 								sprintf(debugmsg, "Cannot open %s in retransmit processing\n", tmpfp->filename);
 								senddebug(MSG_ERROR_1);
 							}
-							return;
+							return (0);
 						}
 						cp->currfp = tmpfp;
 						stat(tmpfp->filename, &statbuf);
@@ -175,7 +174,7 @@ char	b[20];
 								sprintf(debugmsg, "Cannot open %s in retransmit, last file closed.\n");
 								senddebug(MSG_ERROR_1);
 							}
-							return;
+							return (0);
 						}
 						cp->currfp = tmpfp;
 						stat(tmpfp->filename, &statbuf);
@@ -231,6 +230,5 @@ char	b[20];
 		}
 		break;
 	}
-	return(0);
+	return (0);
 }
-