6894056 libc is not clean

6894060 libnsl is not lint clean
6894068 libpool is not lint clean
6894073 some zone libs are not lint clean
6913623 some user land components of ON are not ss12u1 lint clean

2 files changed, 47 insertions, 37 deletions

diff --git a/usr/src/lib/libpool/common/pool_kernel.c b/usr/src/lib/libpool/common/pool_kernel.c
index 3da4f0263c..eeab60f312 100644
--- a/usr/src/lib/libpool/common/pool_kernel.c
+++ b/usr/src/lib/libpool/common/pool_kernel.c
@@ -18,13 +18,12 @@
  *
  * CDDL HEADER END
  */
+
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <assert.h>
 #include <errno.h>
 #include <exacct.h>
@@ -621,7 +620,7 @@ pool_knl_find_nvpair(nvlist_t *l, const char *name)
 	nvpair_t *pair;
 
 	for (pair = nvlist_next_nvpair(l, NULL); pair != NULL;
-		pair = nvlist_next_nvpair(l, pair)) {
+	    pair = nvlist_next_nvpair(l, pair)) {
 		if (strcmp(nvpair_name(pair), name) == 0)
 			break;
 	}
@@ -878,7 +877,7 @@ prop_build_cb(pool_conf_t *UNUSED, pool_elem_t *pe, const char *name,
 	struct knl_to_xml *info = (struct knl_to_xml *)user;
 
 	return (pool_knl_put_xml_property((pool_elem_t *)pe, info->ktx_node,
-		name, pval));
+	    name, pval));
 }
 
 /*
@@ -937,7 +936,7 @@ pool_knl_export(const pool_conf_t *conf, const char *location,
 	switch (fmt) {
 	case POX_NATIVE:
 		info.ktx_doc = xmlNewDoc(BAD_CAST "1.0");
-		xmlCreateIntSubset(info.ktx_doc, BAD_CAST "system",
+		(void) xmlCreateIntSubset(info.ktx_doc, BAD_CAST "system",
 		    BAD_CAST "-//Sun Microsystems Inc//DTD Resource "
 		    "Management All//EN",
 		    BAD_CAST dtd_location);
@@ -964,8 +963,9 @@ pool_knl_export(const pool_conf_t *conf, const char *location,
 		system = info.ktx_node;
 		info.ktx_doc->_private = (void *)conf;
 
-		xmlDocSetRootElement(info.ktx_doc, info.ktx_node);
-		xmlSetProp(info.ktx_node, BAD_CAST c_ref_id, BAD_CAST "dummy");
+		(void) xmlDocSetRootElement(info.ktx_doc, info.ktx_node);
+		(void) xmlSetProp(info.ktx_node, BAD_CAST c_ref_id,
+		    BAD_CAST "dummy");
 		if ((node_comment = xmlNewDocComment(info.ktx_doc,
 		    BAD_CAST "\nConfiguration for pools facility. Do NOT"
 		    " edit this file by hand - use poolcfg(1)"
@@ -1053,7 +1053,7 @@ pool_knl_export(const pool_conf_t *conf, const char *location,
 					sep = " ";
 				}
 				free(rs);
-				xmlSetProp(info.ktx_node, BAD_CAST "res",
+				(void) xmlSetProp(info.ktx_node, BAD_CAST "res",
 				    BAD_CAST cb->cb_buf);
 				if (set_char_buf(cb, "%s_%d",
 				    pool_elem_class_string(elem),
@@ -1063,7 +1063,8 @@ pool_knl_export(const pool_conf_t *conf, const char *location,
 					xmlFreeDoc(info.ktx_doc);
 					return (PO_FAIL);
 				}
-				xmlSetProp(info.ktx_node, BAD_CAST c_ref_id,
+				(void) xmlSetProp(info.ktx_node,
+				    BAD_CAST c_ref_id,
 				    BAD_CAST  cb->cb_buf);
 			}
 			free(ps);
@@ -1106,7 +1107,8 @@ pool_knl_export(const pool_conf_t *conf, const char *location,
 					xmlFreeDoc(info.ktx_doc);
 					return (PO_FAIL);
 				}
-				xmlSetProp(info.ktx_node, BAD_CAST c_ref_id,
+				(void) xmlSetProp(info.ktx_node,
+				    BAD_CAST c_ref_id,
 				    BAD_CAST  cb->cb_buf);
 				if ((cs = pool_query_resource_components(conf,
 				    rs[i], &ncompelem, NULL)) != NULL) {
@@ -1153,7 +1155,7 @@ pool_knl_export(const pool_conf_t *conf, const char *location,
 							    ktx_doc);
 							return (PO_FAIL);
 						}
-						xmlSetProp(info.ktx_node,
+						(void) xmlSetProp(info.ktx_node,
 						    BAD_CAST c_ref_id,
 						    BAD_CAST  cb->cb_buf);
 					}
@@ -1295,7 +1297,7 @@ build_result_set(const void *key, void **value, void *cl)
 			}
 			if (matched == PO_TRUE)
 				(void) pool_knl_result_set_append(qo->rs,
-				(pool_knl_elem_t *)key);
+				    (pool_knl_elem_t *)key);
 		} else {
 			(void) pool_knl_result_set_append(qo->rs,
 			    (pool_knl_elem_t *)key);
@@ -1496,7 +1498,8 @@ pool_knl_set_binding(pool_conf_t *conf, const char *pool_name, idtype_t idtype,
 	bind.pb_o_pool_id = elem_get_sysid(TO_ELEM(pool));
 
 	while ((ret = ioctl(prov->pkc_fd, POOL_BIND, &bind)) < 0 &&
-	    errno == EAGAIN);
+	    errno == EAGAIN)
+		;
 	if (ret < 0) {
 		pool_seterror(POE_SYSTEM);
 		return (PO_FAIL);
@@ -2553,7 +2556,7 @@ pool_knl_get_properties(const pool_elem_t *pe, uint_t *nprops)
 	*nprops = 0;
 
 	for (pair = nvlist_next_nvpair(pke->pke_properties, NULL); pair != NULL;
-		pair = nvlist_next_nvpair(pke->pke_properties, pair))
+	    pair = nvlist_next_nvpair(pke->pke_properties, pair))
 		(*nprops)++;
 	if ((result = calloc(*nprops + 1, sizeof (pool_value_t *))) == NULL) {
 		pool_seterror(POE_SYSTEM);
@@ -2857,7 +2860,8 @@ log_item_commit(log_item_t *li)
 		(void) dict_remove(prov->pkc_elements,
 		    (pool_knl_elem_t *)destroy->pdu_elem);
 		while ((ret = ioctl(prov->pkc_fd, POOL_DESTROY,
-		    &destroy->pdu_ioctl)) < 0 && errno == EAGAIN);
+		    &destroy->pdu_ioctl)) < 0 && errno == EAGAIN)
+			;
 		if (ret < 0) {
 			pool_seterror(POE_SYSTEM);
 			return (PO_FAIL);
@@ -2876,7 +2880,8 @@ log_item_commit(log_item_t *li)
 		assoc->pau_ioctl.pa_o_res_id =
 		    elem_get_sysid(assoc->pau_newres);
 		while ((ret = ioctl(prov->pkc_fd, POOL_ASSOC,
-		    &assoc->pau_ioctl)) < 0 && errno == EAGAIN);
+		    &assoc->pau_ioctl)) < 0 && errno == EAGAIN)
+			;
 		if (ret < 0) {
 			pool_seterror(POE_SYSTEM);
 			return (PO_FAIL);
@@ -2890,7 +2895,8 @@ log_item_commit(log_item_t *li)
 		    elem_get_sysid(dissoc->pdu_dissoc);
 
 		while ((ret = ioctl(prov->pkc_fd, POOL_DISSOC,
-		    &dissoc->pdu_ioctl)) < 0 && errno == EAGAIN);
+		    &dissoc->pdu_ioctl)) < 0 && errno == EAGAIN)
+			;
 		if (ret < 0) {
 			pool_seterror(POE_SYSTEM);
 			return (PO_FAIL);
@@ -3148,7 +3154,8 @@ log_item_undo(log_item_t *li)
 		u_destroy.pd_o_id = create->pcu_ioctl.pc_i_id;
 
 		while ((ret = ioctl(prov->pkc_fd, POOL_DESTROY,
-		    &u_destroy)) < 0 && errno == EAGAIN);
+		    &u_destroy)) < 0 && errno == EAGAIN)
+			;
 		if (ret < 0) {
 			pool_seterror(POE_SYSTEM);
 			return (PO_FAIL);
@@ -3197,7 +3204,7 @@ log_item_undo(log_item_t *li)
 		 * to restore the state of the newly created property
 		 */
 		(void) nvlist_dup(((pool_knl_elem_t *)destroy->pdu_elem)->
-		pke_properties, &tmplist, 0);
+		    pke_properties, &tmplist, 0);
 		for (pair = nvlist_next_nvpair(tmplist, NULL); pair != NULL;
 		    pair = nvlist_next_nvpair(tmplist, pair)) {
 			const pool_prop_t *prop;
@@ -3250,7 +3257,8 @@ log_item_undo(log_item_t *li)
 		u_assoc.pa_o_id_type = assoc->pau_ioctl.pa_o_id_type;
 
 		while ((ret = ioctl(prov->pkc_fd, POOL_ASSOC, &u_assoc)) < 0 &&
-		    errno == EAGAIN);
+		    errno == EAGAIN)
+			;
 		if (ret < 0) {
 			pool_seterror(POE_SYSTEM);
 			return (PO_FAIL);
@@ -3265,7 +3273,8 @@ log_item_undo(log_item_t *li)
 		u_assoc.pa_o_id_type = dissoc->pdu_ioctl.pd_o_id_type;
 
 		while ((ret = ioctl(prov->pkc_fd, POOL_ASSOC, &u_assoc)) < 0 &&
-		    errno == EAGAIN);
+		    errno == EAGAIN)
+			;
 		if (ret < 0) {
 			pool_seterror(POE_SYSTEM);
 			return (PO_FAIL);
diff --git a/usr/src/lib/libpool/common/pool_xml.c b/usr/src/lib/libpool/common/pool_xml.c
index 78ea8f5156..4f0b6df116 100644
--- a/usr/src/lib/libpool/common/pool_xml.c
+++ b/usr/src/lib/libpool/common/pool_xml.c
@@ -19,12 +19,10 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <errno.h>
 #include <fcntl.h>
 #include <limits.h>
@@ -267,11 +265,11 @@ xml_init()
 	/*
 	 * DTD validation, with line numbers.
 	 */
-	xmlLineNumbersDefault(1);
+	(void) xmlLineNumbersDefault(1);
 	xmlLoadExtDtdDefaultValue |= XML_DETECT_IDS;
 	xmlDoValidityCheckingDefaultValue = 1;
 	/* Try to improve indentation and readability */
-	xmlKeepBlanksDefault(0);
+	(void) xmlKeepBlanksDefault(0);
 	/* Send all XML errors to our debug handler */
 	xmlSetGenericErrorFunc(NULL, pool_error_func);
 	/* Load up DTD element a-dtype data to improve performance */
@@ -1218,9 +1216,9 @@ pool_xml_validate(const pool_conf_t *conf, pool_valid_level_t level)
 		 * Note: This is resource specific.
 		 */
 		return (((pool_validate_resource(conf, "pset", c_min_prop, 0) ==
-			    PO_SUCCESS) &&
-			(pool_validate_resource(conf, "pset", c_max_prop, 0) ==
-			    PO_SUCCESS)) ? PO_SUCCESS : PO_FAIL);
+		    PO_SUCCESS) &&
+		    (pool_validate_resource(conf, "pset", c_max_prop, 0) ==
+		    PO_SUCCESS)) ? PO_SUCCESS : PO_FAIL);
 	}
 	return (PO_SUCCESS);
 }
@@ -1539,7 +1537,7 @@ pool_xml_elem_create(pool_conf_t *conf, pool_elem_class_t class,
 		(void) memset(elem, 0, sizeof (pool_xml_resource_t));
 		if ((elem->pxe_node = node_create_with_id
 		    (((pool_xml_elem_t *)parent)->pxe_node,
-			BAD_CAST element_class_tags[class])) == NULL) {
+		    BAD_CAST element_class_tags[class])) == NULL) {
 			pool_seterror(POE_DATASTORE);
 			(void) pool_xml_elem_remove((pool_elem_t *)elem);
 			return (NULL);
@@ -1576,8 +1574,8 @@ pool_xml_elem_create(pool_conf_t *conf, pool_elem_class_t class,
 			return (NULL);
 		}
 		if (xmlSetProp(elem->pxe_node, BAD_CAST c_type,
-			BAD_CAST pool_elem_class_string(
-			    (pool_elem_t *)elem)) == NULL) {
+		    BAD_CAST pool_elem_class_string(
+		    (pool_elem_t *)elem)) == NULL) {
 			pool_seterror(POE_DATASTORE);
 			(void) pool_xml_elem_remove((pool_elem_t *)elem);
 			return (NULL);
@@ -1908,7 +1906,8 @@ pool_xml_set_container(pool_elem_t *pp, pool_elem_t *pc)
 
 	xmlUnlinkNode(pxc->pxe_node);
 	if (xmlAddChild(pxp->pxe_node, pxc->pxe_node) == NULL) {
-		xmlAddChild(parent, pxc->pxe_node); /* Try to move back */
+		/* Try to move back */
+		(void) xmlAddChild(parent, pxc->pxe_node);
 		pool_seterror(POE_INVALID_CONF);
 		return (PO_FAIL);
 	}
@@ -2326,7 +2325,7 @@ pool_build_xpath_buf(pool_xml_connection_t *prov, const pool_elem_t *src,
 				prop_name = attr_name;
 				if (class == PEC_RES_COMP ||
 				    class == PEC_RES_AGG ||
-				class == PEC_COMP) {
+				    class == PEC_COMP) {
 					if (type_prefix != NULL)
 						free(type_prefix);
 					type_prefix = strdup(prefix);
@@ -2412,8 +2411,10 @@ pool_build_xpath_buf(pool_xml_connection_t *prov, const pool_elem_t *src,
 				char *where = strrchr(cb->cb_buf, '[');
 				if (is_attr != PO_TRUE) {
 					/* repeat */
-					while (*--where != '[');
-					while (*--where != '[');
+					while (*--where != '[')
+						;
+					while (*--where != '[')
+						;
 				}
 				*(where - 1) = 'o';
 				*where = 'r';