[illumos-gate merge]

commit 44bf619d328827ce5eca6833fcd5c69f1592e578
    10703 smatch unreachable code checking needs reworking

4 files changed, 4 insertions, 31 deletions

diff --git a/usr/src/cmd/svc/configd/client.c b/usr/src/cmd/svc/configd/client.c
index 13c0140354..9f46d0dff8 100644
--- a/usr/src/cmd/svc/configd/client.c
+++ b/usr/src/cmd/svc/configd/client.c
@@ -22,6 +22,7 @@
 /*
  * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2015 RackTop Systems.
+ * Copyright 2019 Joyent, Inc.
  */
 
 /*
@@ -1988,7 +1989,6 @@ start_audit_session(repcache_client_t *cp)
 		case EFAULT:
 		default:
 			bad_error("door_ucred", errno);
-			return;
 		}
 	}
 	if (adt_start_session(&session, NULL, 0) != 0) {
diff --git a/usr/src/cmd/svc/startd/graph.c b/usr/src/cmd/svc/startd/graph.c
index 452d91250e..d514b19c38 100644
--- a/usr/src/cmd/svc/startd/graph.c
+++ b/usr/src/cmd/svc/startd/graph.c
@@ -21,7 +21,7 @@
 
 /*
  * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2018 Joyent, Inc.
+ * Copyright 2019 Joyent, Inc.
  * Copyright (c) 2015, Syneto S.R.L. All rights reserved.
  * Copyright 2016 Toomas Soome <tsoome@me.com>
  * Copyright 2016 RackTop Systems.
@@ -5833,14 +5833,6 @@ graph_event_thread(void *unused)
 
 		MUTEX_UNLOCK(&gu->gu_lock);
 	}
-
-	/*
-	 * Unreachable for now -- there's currently no graceful cleanup
-	 * called on exit().
-	 */
-	MUTEX_UNLOCK(&gu->gu_lock);
-	scf_handle_destroy(h);
-	return (NULL);
 }
 
 static void
@@ -6206,15 +6198,6 @@ graph_thread(void *arg)
 		(void) pthread_cond_wait(&gu->gu_freeze_cv,
 		    &gu->gu_freeze_lock);
 	}
-
-	/*
-	 * Unreachable for now -- there's currently no graceful cleanup
-	 * called on exit().
-	 */
-	(void) pthread_mutex_unlock(&gu->gu_freeze_lock);
-	scf_handle_destroy(h);
-
-	return (NULL);
 }
 
 
diff --git a/usr/src/cmd/svc/startd/restarter.c b/usr/src/cmd/svc/startd/restarter.c
index 7ed65aab6a..516004c894 100644
--- a/usr/src/cmd/svc/startd/restarter.c
+++ b/usr/src/cmd/svc/startd/restarter.c
@@ -21,7 +21,7 @@
 
 /*
  * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2018 Joyent, Inc.
+ * Copyright 2019 Joyent, Inc.
  */
 
 /*
@@ -2090,14 +2090,6 @@ nolookup:
 			MUTEX_LOCK(&ru->restarter_update_lock);
 		}
 	}
-
-	/*
-	 * Unreachable for now -- there's currently no graceful cleanup
-	 * called on exit().
-	 */
-	(void) scf_handle_unbind(h);
-	scf_handle_destroy(h);
-	return (NULL);
 }
 
 static restarter_inst_t *
diff --git a/usr/src/cmd/svc/svcprop/svcprop.c b/usr/src/cmd/svc/svcprop/svcprop.c
index 6b6f1663f1..fff80364cb 100644
--- a/usr/src/cmd/svc/svcprop/svcprop.c
+++ b/usr/src/cmd/svc/svcprop/svcprop.c
@@ -25,7 +25,7 @@
  */
 
 /*
- * Copyright (c) 2011, Joyent, Inc. All rights reserved.
+ * Copyright 2019 Joyent, Inc.
  */
 
 /*
@@ -630,8 +630,6 @@ process_pg(scf_propertygroup_t *pg)
 			    "has too many components for property "
 			    "group `%s'.\n"), spn->spn_comp1, spn->spn_comp2,
 			    buf);
-
-			free(buf);
 		}
 
 		if (scf_pg_get_property(pg, spn->spn_comp1, prop) == 0) {