[illumos-gate merge]

commit 07eb1aef88b873c5c1036d9cf69820c1ef6a32fb
    11151 libpkcs11: NULL pointer errors
commit c0e21d6af8bfe88f1c49c7c12d4537b663fe9db9
    11150 libdladm: NULL pointer errors
commit c8a3ee0e3658c32402e6bd505596d4fa45bfe17c
    11208 add mdb format character for jazzed-up binary output
    11206 mdb output autowrapping still subtly wrong
    11207 many 64-bit mdb format characters have insufficient width
commit b1e2e3fb17324e9ddf43db264a0c64da7756d9e6
    10936 umem_genasm needs to be stricter about segments
    10937 Clean up umem smatch and cerrwarn
commit 3c308cd1a430039e3b6327544d02ab1a5384066a
    11259 mandoc should allow ERRORS section in all man section 7 variants
commit 3970c09844d4f5e54234620de153ab71a05afbca
    11149 libpkg: NULL pointer errors
commit f00128d8e2d39a5be61357047531dc79fde48623
    11134 libdevinfo: NULL pointer errors
commit 4a014300cea3d870431d7e52aff6781d3c63e5d1
    11143 libscf: NULL pointer errors
commit d60ff33691519a9505afc8818735139f4dfd0c31
    11141 libdtrace: NULL pointer errors
commit 7c207486dba29784d04c67b7d1a97e8cff0a4ff9
    11139 libcpc: NULL pointer errors
commit ce67cb245e522293fca567799070a5cdd4267929
    11131 libtsol: NULL pointer errors
commit 559f8b540657be5e8d59b0b7017058a7ac6ba4bb
    11127 libsip: NULL pointer errors
commit f21450b8fa7a1530d48dc06401e691df1b8965fa
    11121 libadm: NULL pointer errors
commit 5f060f5100426465bddc18c6f81b146ccee30eb8
    11120 libpcidb: NULL pointer errors
commit 22ca2f96318fd461cfbcc23fd450623fe08610a3
    11109 librtld_db: NULL pointer errors
commit 6888a8ba15f151decee7821a09e34fed2fb63513
    11107 mcs: NULL pointer errors
commit 9320f4959b6c72e7a6d056623827091cace259ee
    11106 elfedit: NULL pointer errors
commit fb8f92baa78fdf1ddda6f49125fbd59366393ac8
    11101 libld: NULL pointer errors

	Conflicts:
	usr/src/lib/libumem/amd64/umem_genasm.c

1 files changed, 30 insertions, 30 deletions

diff --git a/usr/src/lib/libdevinfo/devinfo.c b/usr/src/lib/libdevinfo/devinfo.c
index 678f891c90..476c9a2e43 100644
--- a/usr/src/lib/libdevinfo/devinfo.c
+++ b/usr/src/lib/libdevinfo/devinfo.c
@@ -147,7 +147,7 @@ di_init_driver(const char *drv_name, uint_t flag)
 
 di_node_t
 di_init_impl(const char *phys_path, uint_t flag,
-	struct di_priv_data *priv)
+    struct di_priv_data *priv)
 {
 	caddr_t pa;
 	int fd, map_size;
@@ -467,7 +467,7 @@ di_drv_next_node(di_node_t node)
 
 	pa = (caddr_t)node - DI_NODE(node)->self;
 
-	if (DI_NODE(node)->next == NULL) {
+	if (DI_NODE(node)->next == 0) {
 		errno = ENXIO;
 		return (DI_NODE_NIL);
 	}
@@ -770,7 +770,7 @@ update_node_list(int action, uint_t flag, struct node_list **headp)
  */
 static void
 walk_one_node(struct node_list **headp, uint_t flag, void *arg,
-	int (*callback)(di_node_t, void *))
+    int (*callback)(di_node_t, void *))
 {
 	DPRINTF((DI_TRACE, "Walking node %s\n", di_node_name((*headp)->node)));
 
@@ -780,7 +780,7 @@ walk_one_node(struct node_list **headp, uint_t flag, void *arg,
 
 int
 di_walk_node(di_node_t root, uint_t flag, void *arg,
-	int (*node_callback)(di_node_t, void *))
+    int (*node_callback)(di_node_t, void *))
 {
 	struct node_list  *head;	/* node_list for tree walk */
 
@@ -816,7 +816,7 @@ di_walk_node(di_node_t root, uint_t flag, void *arg,
  */
 static void
 walk_one_minor_list(struct node_list **headp, const char *desired_type,
-	uint_t flag, void *arg, int (*callback)(di_node_t, di_minor_t, void *))
+    uint_t flag, void *arg, int (*callback)(di_node_t, di_minor_t, void *))
 {
 	int ddm_type;
 	int action = DI_WALK_CONTINUE;
@@ -851,7 +851,7 @@ walk_one_minor_list(struct node_list **headp, const char *desired_type,
 
 int
 di_walk_minor(di_node_t root, const char *minor_type, uint_t flag, void *arg,
-	int (*minor_callback)(di_node_t, di_minor_t, void *))
+    int (*minor_callback)(di_node_t, di_minor_t, void *))
 {
 	struct node_list	*head;	/* node_list for tree walk */
 
@@ -1709,7 +1709,7 @@ di_prop_find(dev_t match_dev, di_node_t node, const char *name)
 
 int
 di_prop_lookup_ints(dev_t dev, di_node_t node, const char *prop_name,
-	int **prop_data)
+    int **prop_data)
 {
 	di_prop_t prop;
 
@@ -1722,7 +1722,7 @@ di_prop_lookup_ints(dev_t dev, di_node_t node, const char *prop_name,
 
 int
 di_prop_lookup_int64(dev_t dev, di_node_t node, const char *prop_name,
-	int64_t **prop_data)
+    int64_t **prop_data)
 {
 	di_prop_t prop;
 
@@ -1748,7 +1748,7 @@ di_prop_lookup_strings(dev_t dev, di_node_t node, const char *prop_name,
 
 int
 di_prop_lookup_bytes(dev_t dev, di_node_t node, const char *prop_name,
-	uchar_t **prop_data)
+    uchar_t **prop_data)
 {
 	di_prop_t prop;
 
@@ -2376,7 +2376,7 @@ di_vhci_first_node(di_node_t root)
 	pa = (caddr_t)root - DI_NODE(root)->self;
 	dap = DI_ALL(pa);
 
-	if (dap->top_vhci_devinfo == NULL) {
+	if (dap->top_vhci_devinfo == 0) {
 		errno = ENXIO;
 		return (DI_NODE_NIL);
 	}
@@ -2397,7 +2397,7 @@ di_vhci_next_node(di_node_t node)
 	DPRINTF((DI_TRACE, "next vhci node on the snap shot:"
 	    " current=%s\n", di_node_name(node)));
 
-	if (DI_NODE(node)->next_vhci == NULL) {
+	if (DI_NODE(node)->next_vhci == 0) {
 		errno = ENXIO;
 		return (DI_NODE_NIL);
 	}
@@ -2425,7 +2425,7 @@ di_phci_first_node(di_node_t vhci_node)
 
 	pa = (caddr_t)vhci_node - DI_NODE(vhci_node)->self;
 
-	if (DI_NODE(vhci_node)->top_phci == NULL) {
+	if (DI_NODE(vhci_node)->top_phci == 0) {
 		errno = ENXIO;
 		return (DI_NODE_NIL);
 	}
@@ -2446,7 +2446,7 @@ di_phci_next_node(di_node_t node)
 	DPRINTF((DI_TRACE, "next phci node on the snap shot:"
 	    " current=%s\n", di_node_name(node)));
 
-	if (DI_NODE(node)->next_phci == NULL) {
+	if (DI_NODE(node)->next_phci == 0) {
 		errno = ENXIO;
 		return (DI_NODE_NIL);
 	}
@@ -2535,7 +2535,7 @@ typedef struct {
 static int
 di_walk_hp_callback(di_node_t node, void *argp)
 {
-	di_walk_hp_arg_t 	*arg = (di_walk_hp_arg_t *)argp;
+	di_walk_hp_arg_t	*arg = (di_walk_hp_arg_t *)argp;
 	di_hp_t			hp;
 	char			*type_str;
 
@@ -2890,7 +2890,7 @@ di_prom_fini(di_prom_handle_t ph)
  */
 static di_prom_prop_t
 di_prom_prop_found(di_prom_handle_t ph, int nodeid,
-	di_prom_prop_t prom_prop)
+    di_prom_prop_t prom_prop)
 {
 	struct di_prom_handle *p = (struct di_prom_handle *)ph;
 	struct openpromio *opp = &p->oppbuf.opp;
@@ -3028,7 +3028,7 @@ di_prom_prop_data(di_prom_prop_t prom_prop, uchar_t **prom_prop_data)
 	 */
 	if (prom_prop == DI_PROM_PROP_NIL) {
 		errno = EINVAL;
-		return (NULL);
+		return (0);
 	}
 
 	*prom_prop_data = ((struct di_prom_prop *)prom_prop)->data;
@@ -3042,7 +3042,7 @@ di_prom_prop_data(di_prom_prop_t prom_prop, uchar_t **prom_prop_data)
  */
 static struct di_prom_prop *
 di_prom_prop_lookup_common(di_prom_handle_t ph, di_node_t node,
-	const char *prom_prop_name)
+    const char *prom_prop_name)
 {
 	struct openpromio *opp;
 	struct di_prom_prop *prop;
@@ -3142,7 +3142,7 @@ di_prom_prop_lookup_common(di_prom_handle_t ph, di_node_t node,
 
 int
 di_prom_prop_lookup_ints(di_prom_handle_t ph, di_node_t node,
-	const char *prom_prop_name, int **prom_prop_data)
+    const char *prom_prop_name, int **prom_prop_data)
 {
 	int len;
 	struct di_prom_prop *prop;
@@ -3168,7 +3168,7 @@ di_prom_prop_lookup_ints(di_prom_handle_t ph, di_node_t node,
 
 int
 di_prom_prop_lookup_strings(di_prom_handle_t ph, di_node_t node,
-	const char *prom_prop_name, char **prom_prop_data)
+    const char *prom_prop_name, char **prom_prop_data)
 {
 	int len;
 	struct di_prom_prop *prop;
@@ -3211,7 +3211,7 @@ di_prom_prop_lookup_strings(di_prom_handle_t ph, di_node_t node,
 
 int
 di_prom_prop_lookup_bytes(di_prom_handle_t ph, di_node_t node,
-	const char *prom_prop_name, uchar_t **prom_prop_data)
+    const char *prom_prop_name, uchar_t **prom_prop_data)
 {
 	int len;
 	struct di_prom_prop *prop;
@@ -3460,11 +3460,11 @@ di_lnode_next(di_node_t node, di_lnode_t lnode)
 	di_all = DI_ALL((caddr_t)node - DI_NODE(node)->self);
 
 	if (lnode == DI_NODE_NIL) {
-		if (DI_NODE(node)->lnodes != NULL)
+		if (DI_NODE(node)->lnodes != 0)
 			return (DI_LNODE((caddr_t)di_all +
 			    DI_NODE(node)->lnodes));
 	} else {
-		if (DI_LNODE(lnode)->node_next != NULL)
+		if (DI_LNODE(lnode)->node_next != 0)
 			return (DI_LNODE((caddr_t)di_all +
 			    DI_LNODE(lnode)->node_next));
 	}
@@ -3495,21 +3495,21 @@ di_link_next_by_node(di_node_t node, di_link_t link, uint_t endpoint)
 
 	if (endpoint == DI_LINK_SRC) {
 		if (link == DI_LINK_NIL) {
-			if (DI_NODE(node)->src_links != NULL)
+			if (DI_NODE(node)->src_links != 0)
 				return (DI_LINK((caddr_t)di_all +
 				    DI_NODE(node)->src_links));
 		} else {
-			if (DI_LINK(link)->src_node_next != NULL)
+			if (DI_LINK(link)->src_node_next != 0)
 				return (DI_LINK((caddr_t)di_all +
 				    DI_LINK(link)->src_node_next));
 		}
 	} else {
 		if (link == DI_LINK_NIL) {
-			if (DI_NODE(node)->tgt_links != NULL)
+			if (DI_NODE(node)->tgt_links != 0)
 				return (DI_LINK((caddr_t)di_all +
 				    DI_NODE(node)->tgt_links));
 		} else {
-			if (DI_LINK(link)->tgt_node_next != NULL)
+			if (DI_LINK(link)->tgt_node_next != 0)
 				return (DI_LINK((caddr_t)di_all +
 				    DI_LINK(link)->tgt_node_next));
 		}
@@ -3541,24 +3541,24 @@ di_link_next_by_lnode(di_lnode_t lnode, di_link_t link, uint_t endpoint)
 
 	if (endpoint == DI_LINK_SRC) {
 		if (link == DI_LINK_NIL) {
-			if (DI_LNODE(lnode)->link_out == NULL)
+			if (DI_LNODE(lnode)->link_out == 0)
 				return (DI_LINK_NIL);
 			return (DI_LINK((caddr_t)di_all +
 			    DI_LNODE(lnode)->link_out));
 		} else {
-			if (DI_LINK(link)->src_link_next == NULL)
+			if (DI_LINK(link)->src_link_next == 0)
 				return (DI_LINK_NIL);
 			return (DI_LINK((caddr_t)di_all +
 			    DI_LINK(link)->src_link_next));
 		}
 	} else {
 		if (link == DI_LINK_NIL) {
-			if (DI_LNODE(lnode)->link_in == NULL)
+			if (DI_LNODE(lnode)->link_in == 0)
 				return (DI_LINK_NIL);
 			return (DI_LINK((caddr_t)di_all +
 			    DI_LNODE(lnode)->link_in));
 		} else {
-			if (DI_LINK(link)->tgt_link_next == NULL)
+			if (DI_LINK(link)->tgt_link_next == 0)
 				return (DI_LINK_NIL);
 			return (DI_LINK((caddr_t)di_all +
 			    DI_LINK(link)->tgt_link_next));