Sync illumos to 13771:2903afd49fe8
authorJon Tibble <meths@btinternet.com>
Wed, 15 Aug 2012 20:33:23 +0100
changeset 13828 75cb7d9d9b7b
parent 13825 5fbdaf71144f (current diff)
parent 13827 2903afd49fe8 (diff)
child 13831 252c319bee12
Sync illumos to 13771:2903afd49fe8
usr/src/uts/common/os/logsubr.c
--- a/usr/src/cmd/tcpd/fakelog.c	Sun Aug 12 14:50:58 2012 +0100
+++ b/usr/src/cmd/tcpd/fakelog.c	Wed Aug 15 20:33:23 2012 +0100
@@ -16,7 +16,7 @@
 /* openlog - dummy */
 
 /* ARGSUSED */
-
+void
 openlog(name, logopt, facility)
 char   *name;
 int     logopt;
@@ -26,7 +26,7 @@
 }
 
 /* vsyslog - format one record */
-
+void
 vsyslog(severity, fmt, ap)
 int     severity;
 char   *fmt;
@@ -42,7 +42,7 @@
 /* syslog - format one record */
 
 /* VARARGS */
-
+void
 VARARGS(syslog, int, severity)
 {
     va_list ap;
@@ -55,7 +55,7 @@
 }
 
 /* closelog - dummy */
-
+void
 closelog()
 {
     /* void */
--- a/usr/src/cmd/tcpd/safe_finger.c	Sun Aug 12 14:50:58 2012 +0100
+++ b/usr/src/cmd/tcpd/safe_finger.c	Wed Aug 15 20:33:23 2012 +0100
@@ -49,6 +49,7 @@
     exit(0);
 }
 
+int
 main(argc, argv)
 int     argc;
 char  **argv;
--- a/usr/src/cmd/tcpd/tcpd.c	Sun Aug 12 14:50:58 2012 +0100
+++ b/usr/src/cmd/tcpd/tcpd.c	Wed Aug 15 20:33:23 2012 +0100
@@ -41,6 +41,7 @@
 int     allow_severity = SEVERITY;	/* run-time adjustable */
 int     deny_severity = LOG_WARNING;	/* ditto */
 
+int
 main(argc, argv)
 int     argc;
 char  **argv;
--- a/usr/src/cmd/tcpd/try-from.c	Sun Aug 12 14:50:58 2012 +0100
+++ b/usr/src/cmd/tcpd/try-from.c	Wed Aug 15 20:33:23 2012 +0100
@@ -37,6 +37,7 @@
 int     allow_severity = SEVERITY;	/* run-time adjustable */
 int     deny_severity = LOG_WARNING;	/* ditto */
 
+int
 main(argc, argv)
 int     argc;
 char  **argv;
--- a/usr/src/uts/common/io/dcopy.c	Sun Aug 12 14:50:58 2012 +0100
+++ b/usr/src/uts/common/io/dcopy.c	Wed Aug 15 20:33:23 2012 +0100
@@ -24,8 +24,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*
  * dcopy.c
  *    dcopy misc module
@@ -329,7 +327,7 @@
 {
 	dcopy_device_handle_t device;
 	dcopy_list_t *list;
-	boolean_t cleanup;
+	boolean_t cleanup = B_FALSE;
 
 
 	ASSERT(*channel != NULL);
@@ -348,7 +346,6 @@
 	 * removed on the device.
 	 */
 	if ((*channel)->ch_removing && ((*channel)->ch_ref_cnt == 0)) {
-		cleanup = B_FALSE;
 		device = (*channel)->ch_device;
 		mutex_enter(&device->dc_devchan_list.dl_mutex);
 		device->dc_removing_cnt--;
--- a/usr/src/uts/common/os/logsubr.c	Sun Aug 12 14:50:58 2012 +0100
+++ b/usr/src/uts/common/os/logsubr.c	Wed Aug 15 20:33:23 2012 +0100
@@ -246,7 +246,7 @@
 	/*
 	 * Now that logging is enabled, emit the SunOS banner.
 	 */
-	printf("\rOpenIndiana Build %s %u-bit (illumos 13769:2317a7492de4)\n",
+	printf("\rOpenIndiana Build %s %u-bit (illumos 13771:2903afd49fe8)\n",
 	    utsname.version, NBBY * (uint_t)sizeof (void *));
 	printf("SunOS Release %s - Copyright 1983-2010 Oracle and/or its "
 	    "affiliates.\n", utsname.release);