[illumos-gate merge]

commit 022bfefbcaaea5feb95b93e32451de7e29dbcb58
    10324 topo_usb_parse_port_type() gets value check wrong
commit b1f626711b7485860ff0a6eb5e6edc949958f605
    10130 smatch fixes for usr/src/cmd/fm
commit 8e4148b01b8967e1a9ff6fdb6c8a2baff7363432
    10115 ses topo module needs smatch fixes
commit 0627591eb8261c55a48bc3b17ff3dfe0d0568939
    10114 fmev_proxy_cb() doesn't need inval checks
commit f1c3c46914bb8b71335ee0d065b1a639f9caad89
    10113 fmd_adm_xprt_f should return void
commit 29c3ebdbcfe9e0ec2a1d2e45961c53e573b9d3ab
    10102 libnvfru needs smatch fixes
commit f6b3f249ec2ef9f94d38d7a7c1b4fcbe2e891933
    9776 mandoc(1) does not support an ERRORS section for 7I man pages
    9778 Convert agpgart_io(7I) to mandoc
    9779 Convert audio(7I) to mandoc
    9780 Convert cdio(7I) to mandoc
    9777 Convert dsp(7I) to mandoc
commit 1bc1e552b353b59f21e7697fe988ec2d86d09d4b
    10325 sparc also needs plat_diagpath for consconfig_dacf
commit 406d4d29fb52df8ec016b6e9a83e030013fa1514
    10333 cw: error: comparison between pointer and zero character constant

4 files changed, 23 insertions, 12 deletions

diff --git a/usr/src/cmd/fm/fmdump/common/fault.c b/usr/src/cmd/fm/fmdump/common/fault.c
index 68f84faf5f..6019c7f294 100644
--- a/usr/src/cmd/fm/fmdump/common/fault.c
+++ b/usr/src/cmd/fm/fmdump/common/fault.c
@@ -20,7 +20,7 @@
  */
 /*
  * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2017, Joyent, Inc. All rights reserved.
+ * Copyright (c) 2018, Joyent, Inc.
  */
 
 #include <fmdump.h>
@@ -183,7 +183,7 @@ flt_verb23_cmn(fmd_log_t *lp, const fmd_log_record_t *rp, FILE *fp,
 
 	for (i = 0; i < rp->rec_nrefs; i++) {
 		fmdump_printf(fp, "  ");
-		efp->do_func(lp, &rp->rec_xrefs[i], fp);
+		(void) efp->do_func(lp, &rp->rec_xrefs[i], fp);
 	}
 
 	fmdump_printf(fp, "\n");
diff --git a/usr/src/cmd/fm/fmstat/common/fmstat.c b/usr/src/cmd/fm/fmstat/common/fmstat.c
index adc14fe40b..e779fca00b 100644
--- a/usr/src/cmd/fm/fmstat/common/fmstat.c
+++ b/usr/src/cmd/fm/fmstat/common/fmstat.c
@@ -24,6 +24,10 @@
  * Use is subject to license terms.
  */
 
+/*
+ * Copyright (c) 2018, Joyent, Inc.
+ */
+
 #include <fm/fmd_adm.h>
 
 #include <strings.h>
@@ -373,7 +377,7 @@ modstat_compute(struct modstats *mp, fmd_adm_stats_t *ams)
 }
 
 /*ARGSUSED*/
-static int
+static void
 stat_one_xprt(id_t id, void *ignored)
 {
 	fmd_adm_stats_t ams;
@@ -381,7 +385,7 @@ stat_one_xprt(id_t id, void *ignored)
 
 	if (fmd_adm_xprt_stats(g_adm, id, &ams) != 0) {
 		warn("failed to retrieve statistics for transport %d", (int)id);
-		return (0); /* continue on to the next transport */
+		return;
 	}
 
 	for (mp = g_mods; mp != NULL; mp = mp->m_next) {
@@ -392,7 +396,7 @@ stat_one_xprt(id_t id, void *ignored)
 	if (mp == NULL && (mp = modstat_create(NULL, id)) == NULL) {
 		warn("failed to allocate memory for transport %d", (int)id);
 		(void) fmd_adm_stats_free(g_adm, &ams);
-		return (0);
+		return;
 	}
 
 	modstat_compute(mp, &ams);
@@ -412,7 +416,6 @@ stat_one_xprt(id_t id, void *ignored)
 	    mp->m_new->module.fmds_value.str);
 
 	(void) fmd_adm_stats_free(g_adm, &ams);
-	return (0);
 }
 
 static void
@@ -426,7 +429,7 @@ stat_xprt(void)
 		die("failed to retrieve list of transports");
 }
 
-static int
+static void
 stat_one_xprt_auth(id_t id, void *arg)
 {
 	const char *module = arg;
@@ -435,7 +438,7 @@ stat_one_xprt_auth(id_t id, void *arg)
 
 	if (fmd_adm_xprt_stats(g_adm, id, &ams) != 0) {
 		warn("failed to retrieve statistics for transport %d", (int)id);
-		return (0); /* continue on to the next transport */
+		return;
 	}
 
 	for (mp = g_mods; mp != NULL; mp = mp->m_next) {
@@ -446,7 +449,7 @@ stat_one_xprt_auth(id_t id, void *arg)
 	if (mp == NULL && (mp = modstat_create(NULL, id)) == NULL) {
 		warn("failed to allocate memory for transport %d", (int)id);
 		(void) fmd_adm_stats_free(g_adm, &ams);
-		return (0);
+		return;
 	}
 
 	modstat_compute(mp, &ams);
@@ -461,7 +464,6 @@ stat_one_xprt_auth(id_t id, void *arg)
 	}
 
 	(void) fmd_adm_stats_free(g_adm, &ams);
-	return (0);
 }
 
 static void
diff --git a/usr/src/cmd/fm/notify/smtp-notify/common/smtp-notify.c b/usr/src/cmd/fm/notify/smtp-notify/common/smtp-notify.c
index a94baffed6..ba42e20d91 100644
--- a/usr/src/cmd/fm/notify/smtp-notify/common/smtp-notify.c
+++ b/usr/src/cmd/fm/notify/smtp-notify/common/smtp-notify.c
@@ -22,6 +22,11 @@
 /*
  * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
  */
+
+/*
+ * Copyright (c) 2018, Joyent, Inc.
+ */
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -811,7 +816,7 @@ main(int argc, char *argv[])
 				break;
 			default:
 				free(nhdl);
-				return (usage(nhdl->nh_pname));
+				return (usage(argv[0]));
 			}
 		}
 	}
diff --git a/usr/src/cmd/fm/notify/snmp-notify/common/snmp-notify.c b/usr/src/cmd/fm/notify/snmp-notify/common/snmp-notify.c
index 76ed1637a0..adb0c10032 100644
--- a/usr/src/cmd/fm/notify/snmp-notify/common/snmp-notify.c
+++ b/usr/src/cmd/fm/notify/snmp-notify/common/snmp-notify.c
@@ -23,6 +23,10 @@
  * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
+/*
+ * Copyright (c) 2018, Joyent, Inc.
+ */
+
 #include <sys/fm/protocol.h>
 #include <fm/fmd_snmp.h>
 #include <fm/fmd_msg.h>
@@ -577,7 +581,7 @@ main(int argc, char *argv[])
 				break;
 			default:
 				free(nhdl);
-				return (usage(nhdl->nh_pname));
+				return (usage(argv[0]));
 			}
 		}
 	}