5 files changed, 10 insertions, 8 deletions
diff --git a/usr.sbin/pmc/cmd_pmc_filter.cc b/usr.sbin/pmc/cmd_pmc_filter.cc
index ecb5d3d4edf8..6a0a584f8dd9 100644
--- a/usr.sbin/pmc/cmd_pmc_filter.cc
+++ b/usr.sbin/pmc/cmd_pmc_filter.cc
@@ -89,7 +89,7 @@ static struct option longopts[] = {
 	{NULL, 0, NULL, 0}
 };
 
-static void
+static void __dead2
 usage(void)
 {
 	errx(EX_USAGE,
diff --git a/usr.sbin/pmc/cmd_pmc_list.c b/usr.sbin/pmc/cmd_pmc_list.c
index 33be47083f45..2e1117e326e6 100644
--- a/usr.sbin/pmc/cmd_pmc_list.c
+++ b/usr.sbin/pmc/cmd_pmc_list.c
@@ -75,7 +75,7 @@ static struct option longopts[] = {
 	{NULL, 0, NULL, 0}
 };
 
-static void
+static void __dead2
 usage(void)
 {
 	errx(EX_USAGE,
diff --git a/usr.sbin/pmc/cmd_pmc_stat.c b/usr.sbin/pmc/cmd_pmc_stat.c
index 7ea54c08681f..44ca7b92dea7 100644
--- a/usr.sbin/pmc/cmd_pmc_stat.c
+++ b/usr.sbin/pmc/cmd_pmc_stat.c
@@ -106,7 +106,7 @@ static const char *pmc_stat_mode_names[] = {
 
 static int pmcstat_sockpair[NSOCKPAIRFD];
 
-static void
+static void __dead2
 usage(void)
 {
 	errx(EX_USAGE,
@@ -127,8 +127,10 @@ showtime(FILE *out, struct timespec *before, struct timespec *after,
 
 	after->tv_sec -= before->tv_sec;
 	after->tv_nsec -= before->tv_nsec;
-	if (after->tv_nsec < 0)
-		after->tv_sec--, after->tv_nsec += 1000000000;
+	if (after->tv_nsec < 0) {
+		after->tv_sec--;
+		after->tv_nsec += 1000000000;
+	}
 
 	real = (after->tv_sec * 1000000000 + after->tv_nsec) / 1000;
 	user = ru->ru_utime.tv_sec * 1000000 + ru->ru_utime.tv_usec;
diff --git a/usr.sbin/pmc/cmd_pmc_summary.cc b/usr.sbin/pmc/cmd_pmc_summary.cc
index ea2ca6a4c7f5..8eb53eccf0cf 100644
--- a/usr.sbin/pmc/cmd_pmc_summary.cc
+++ b/usr.sbin/pmc/cmd_pmc_summary.cc
@@ -83,7 +83,7 @@ typedef unordered_map <uint32_t, std::vector<samplename>> eventcountmap;
 
 #define	P_KPROC		0x00004	/* Kernel process. */
 
-static void
+static void __dead2
 usage(void)
 {
 	errx(EX_USAGE,
diff --git a/usr.sbin/pmc/pmc.c b/usr.sbin/pmc/pmc.c
index 296ed0bb0201..3506f2bcec50 100644
--- a/usr.sbin/pmc/pmc.c
+++ b/usr.sbin/pmc/pmc.c
@@ -70,8 +70,8 @@ static struct cmd_handler disp_table[] = {
 	{NULL, NULL}
 };
 
-static void
-usage(void)
+static void __dead2
+usage(void) 
 {
 	errx(EX_USAGE,
 	    "\t pmc management utility\n"