6273905 gcc and cmd/svc don't get along

6269767 add __NORETURN to libuutils death functions 

7 files changed, 16 insertions, 10 deletions

diff --git a/usr/src/cmd/svc/configd/configd.h b/usr/src/cmd/svc/configd/configd.h
index 7d01a9005e..dc170fc2d7 100644
--- a/usr/src/cmd/svc/configd/configd.h
+++ b/usr/src/cmd/svc/configd/configd.h
@@ -691,7 +691,7 @@ rep_protocol_responseid_t backend_create_backup(const char *);
  * call on any database inconsistency -- cleans up state as best it can,
  * and exits with a "Database Bad" error code.
  */
-void backend_panic(const char *, ...);
+void backend_panic(const char *, ...) __NORETURN;
 #pragma rarely_called(backend_panic)
 
 backend_query_t *backend_query_alloc(void);
diff --git a/usr/src/cmd/svc/configd/file_object.c b/usr/src/cmd/svc/configd/file_object.c
index b4f177f1eb..bbe400e4bf 100644
--- a/usr/src/cmd/svc/configd/file_object.c
+++ b/usr/src/cmd/svc/configd/file_object.c
@@ -143,7 +143,7 @@ delete_stack_pop(delete_info_t *dip, delete_ent_t *out)
 	delete_ent_t *ent;
 
 	if (cur == NULL)
-		return (NULL);
+		return (0);
 	assert(cur->ds_cur > 0 && cur->ds_cur <= cur->ds_size);
 	ent = &cur->ds_buf[--cur->ds_cur];
 	if (cur->ds_cur == 0) {
diff --git a/usr/src/cmd/svc/configd/rc_node.c b/usr/src/cmd/svc/configd/rc_node.c
index 514a5f1c4e..903aea20ec 100644
--- a/usr/src/cmd/svc/configd/rc_node.c
+++ b/usr/src/cmd/svc/configd/rc_node.c
@@ -294,7 +294,7 @@ rc_node_hash(rc_node_lookup_t *lp)
 {
 	uint32_t type = lp->rl_type;
 	uint32_t backend = lp->rl_backend;
-	uint32_t main = lp->rl_main_id;
+	uint32_t mainid = lp->rl_main_id;
 	uint32_t *ids = lp->rl_ids;
 
 	rc_type_info_t *tp = &rc_types[type];
@@ -311,7 +311,7 @@ rc_node_hash(rc_node_lookup_t *lp)
 	left = MAX_IDS - num_ids;
 	assert(num_ids <= MAX_IDS);
 
-	hash = type * 7 + main * 5 + backend;
+	hash = type * 7 + mainid * 5 + backend;
 
 	while (num_ids-- > 0)
 		hash = hash * 11 + *ids++ * 7;
diff --git a/usr/src/cmd/svc/lsvcrun/lsvcrun.c b/usr/src/cmd/svc/lsvcrun/lsvcrun.c
index 4b920fb68a..6bc263655f 100644
--- a/usr/src/cmd/svc/lsvcrun/lsvcrun.c
+++ b/usr/src/cmd/svc/lsvcrun/lsvcrun.c
@@ -20,7 +20,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -636,7 +636,7 @@ add_new_property(scf_handle_t *h, scf_transaction_t *tx, const char *name,
 
 	switch (ty) {
 	case SCF_TYPE_COUNT:
-		scf_value_set_count(v, (uint64_t)val);
+		scf_value_set_count(v, (uint64_t)(uintptr_t)val);
 		break;
 
 	case SCF_TYPE_TIME:
diff --git a/usr/src/cmd/svc/svcadm/svcadm.c b/usr/src/cmd/svc/svcadm/svcadm.c
index 796f43965c..a33f1babc9 100644
--- a/usr/src/cmd/svc/svcadm/svcadm.c
+++ b/usr/src/cmd/svc/svcadm/svcadm.c
@@ -20,7 +20,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -95,6 +95,9 @@ static char *scratch_fmri;
 
 static struct ht_elt **visited;
 
+void do_scfdie(int lineno) __NORETURN;
+static void usage_milestone(void) __NORETURN;
+
 /*
  * Visitors from synch.c, needed for enable -s and disable -s.
  */
@@ -2005,7 +2008,7 @@ static char const *milestones[] = {
 };
 
 static void
-usage_milestone()
+usage_milestone(void)
 {
 	const char **ms;
 
diff --git a/usr/src/cmd/svc/svcadm/synch.c b/usr/src/cmd/svc/svcadm/synch.c
index 74cf81fbb3..721308962a 100644
--- a/usr/src/cmd/svc/svcadm/synch.c
+++ b/usr/src/cmd/svc/svcadm/synch.c
@@ -20,7 +20,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -51,7 +51,7 @@
 extern scf_handle_t *h;
 extern ssize_t max_scf_fmri_sz;
 
-extern void do_scfdie(int);
+extern void do_scfdie(int) __NORETURN;
 extern int inst_get_state(scf_instance_t *, char *, const char *,
     scf_propertygroup_t **);
 extern ssize_t get_astring_prop(const scf_propertygroup_t *, const char *,
diff --git a/usr/src/cmd/svc/svccfg/svccfg_libscf.c b/usr/src/cmd/svc/svccfg/svccfg_libscf.c
index 29bd9ae86e..994a881388 100644
--- a/usr/src/cmd/svc/svccfg/svccfg_libscf.c
+++ b/usr/src/cmd/svc/svccfg/svccfg_libscf.c
@@ -211,6 +211,9 @@ static scf_iter_t *exp_inst_iter, *exp_pg_iter, *exp_prop_iter, *exp_val_iter;
 static char *exp_str;
 static size_t exp_str_sz;
 
+static void scfdie(void) __NORETURN;
+static void scfdie_lineno(int lineno) __NORETURN;
+
 static char *start_method_names[] = {
 	"start",
 	"inetd_start",