[illumos-gate merge]

commit 93d26c05275be2c44aedd16705237484fc0a0990
    13015 fruaccess: comparison between pointer and zero character constant
commit ba12489a763ade223e478c59fdc4cb752fcba568
    13011 tsalarm: '*' in boolean context, suggest '&&' instead
commit 09e6639baaf32231365cb9895bf1e0ea006a2a60
    12885 efcode: smatch and build errors
commit e4af2f17fac5babc25d094f1bf22dd06515f66c7
    13104 zfs: offset_t is signed and can not be > MAXOFFSET_T
commit 7aaede4825001926ae223b8c47ef9e4d0d6021ba
    12974 libc: left shift of negative value
commit 712669c9fa9278704a4ccefe1d96acaf29397d36
    13103 zfs: zvol_strategy() warn: unsigned 'off' is never less than zero
commit e075c017fe4c71cde62297bcc90d3411c0f4ad1d
    12512 dispadmin.1m manpage is missing \fB \fR around FX
commit 9b0881404678e5235132f9320785c3f5ce6e71f6
    13087 zfs: zfs_ereport_post() and zfs_ereport_start() return values are ignored
commit 5365b8a5984eca60a3cedc7f9f738e51fb056bec
    12936 bhyve vlapic needs ability to bypass isrvec_stk

1 files changed, 11 insertions, 13 deletions

diff --git a/usr/src/lib/efcode/efdaemon/efdaemon.c b/usr/src/lib/efcode/efdaemon/efdaemon.c
index 2450d2d1fa..20321bf135 100644
--- a/usr/src/lib/efcode/efdaemon/efdaemon.c
+++ b/usr/src/lib/efcode/efdaemon/efdaemon.c
@@ -24,8 +24,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*
  * efdaemon - Emebbed Fcode Interpreter daemon.
  *
@@ -89,7 +87,7 @@ main(int argc, char **argv)
 			    strerror(errno));
 		exit(1);
 	}
-	close(fd);
+	(void) close(fd);
 
 	/*
 	 * Ensure that /usr/lib/efcode/efcode.sh exists and is executable.
@@ -113,10 +111,10 @@ main(int argc, char **argv)
 	/*
 	 * detach from tty here.
 	 */
-	setpgrp();
-	close(0);
-	close(1);
-	close(2);
+	(void) setpgrp();
+	(void) close(0);
+	(void) close(1);
+	(void) close(2);
 	(void) open("/dev/null", O_RDWR);
 	(void) dup(0);
 	(void) dup(0);
@@ -127,7 +125,7 @@ main(int argc, char **argv)
 			if (nerr == 1)
 				syslog(LOG_ERR, "Can't open %s: %s\n",
 				    dev_fcode_file, strerror(errno));
-			sleep(1);
+			(void) sleep(1);
 		}
 		if (nerr > 1) {
 			syslog(LOG_ERR, "Open on %s failed %d times\n",
@@ -138,7 +136,7 @@ main(int argc, char **argv)
 		if (nbytes < 0) {
 			syslog(LOG_ERR, "Read of %s: %s\n", dev_fcode_file,
 			    strerror(errno));
-			close(fd);
+			(void) close(fd);
 			continue;
 		}
 		if (debug)
@@ -148,7 +146,7 @@ main(int argc, char **argv)
 			if (nerr == 1)
 				syslog(LOG_ERR, "Fork failed: %s\n",
 				    strerror(errno));
-			sleep(1);
+			(void) sleep(1);
 		}
 		if ((nerr > 1) && pid) {
 			syslog(LOG_ERR, "Fork failed %d times\n", nerr);
@@ -178,19 +176,19 @@ main(int argc, char **argv)
 				}
 			} else if (debug)
 				syslog(LOG_DEBUG, "Wait: pid: %d\n", pid);
-			close(fd);
+			(void) close(fd);
 			continue;
 		}
 		if (debug)
 			syslog(LOG_DEBUG, "Child: %d processing request\n",
 			    getpid());
-		fcntl(fd, F_DUP2FD, 0);
+		(void) fcntl(fd, F_DUP2FD, 0);
 		while (execl("/bin/sh", "sh", efcode_sh_file, NULL)) {
 			nerr++;
 			if (nerr == 1)
 				syslog(LOG_ERR, "execl(/bin/sh) failed: %s\n",
 				    strerror(errno));
-			sleep(1);
+			(void) sleep(1);
 		}
 	}