11145 cfgadm_plugins: NULL pointer errors

Reviewed by: John Levon <john.levon@joyent.com>
Approved by: Richard Lowe <richlowe@richlowe.net>

10 files changed, 41 insertions, 43 deletions

diff --git a/usr/src/lib/cfgadm_plugins/fp/common/cfga_cs.c b/usr/src/lib/cfgadm_plugins/fp/common/cfga_cs.c
index 8920d99df0..d9f758ee6a 100644
--- a/usr/src/lib/cfgadm_plugins/fp/common/cfga_cs.c
+++ b/usr/src/lib/cfgadm_plugins/fp/common/cfga_cs.c
@@ -71,7 +71,7 @@ do_devctl_dev_create(apid_t *apidt, char *dev_path, int pathlen,
 	char		*drvr_name = "dummy";
 	la_wwn_t	pwwn;
 
-	*dev_path = NULL;
+	*dev_path = '\0';
 	if ((ddef_hdl = devctl_ddef_alloc(drvr_name, 0)) == NULL) {
 		cfga_err(errstring, errno, ERRARG_DC_DDEF_ALLOC, drvr_name, 0);
 		return (FPCFGA_LIB_ERR);
diff --git a/usr/src/lib/cfgadm_plugins/fp/common/cfga_list.c b/usr/src/lib/cfgadm_plugins/fp/common/cfga_list.c
index 8bde695934..a3991c2055 100644
--- a/usr/src/lib/cfgadm_plugins/fp/common/cfga_list.c
+++ b/usr/src/lib/cfgadm_plugins/fp/common/cfga_list.c
@@ -3087,7 +3087,7 @@ init_ldata_for_accessible_FCP_dev(
 			S_FREE(inq_buf);
 			continue;
 		}
-		*dtype = NULL;
+		*dtype = '\0';
 		for (j = 0; j < N_DEVICE_TYPES; j++) {
 		    if ((inq_buf->inq_dtype & DTYPE_MASK)
 				== device_list[j].itype) {
@@ -3096,7 +3096,7 @@ init_ldata_for_accessible_FCP_dev(
 			break;
 		    }
 		}
-		if (*dtype == NULL) {
+		if (*dtype == '\0') {
 			(void) strlcpy(dtype,
 				(char *)device_list[DTYPE_UNKNOWN_INDEX].name,
 				CFGA_TYPE_LEN);
diff --git a/usr/src/lib/cfgadm_plugins/fp/common/cfga_rep.c b/usr/src/lib/cfgadm_plugins/fp/common/cfga_rep.c
index 0ca8cb4e09..17cd3c0b17 100644
--- a/usr/src/lib/cfgadm_plugins/fp/common/cfga_rep.c
+++ b/usr/src/lib/cfgadm_plugins/fp/common/cfga_rep.c
@@ -82,10 +82,10 @@ search_line(char *buf, int buflen, char *srch_str, int slen,
 	*bytes_left = buflen;
 	*write_offset = 0;
 
-	if (buf == NULL || *buf == NULL || buflen <= 0)
+	if (buf == NULL || *buf == '\0' || buflen <= 0)
 		return (-2);	/* Arbitrary -ve val. srch_str not found */
 
-	if (srch_str == NULL || *srch_str == NULL || slen <= 0)
+	if (srch_str == NULL || *srch_str == '\0' || slen <= 0)
 		return (0);	/* This says srch_str was found */
 
 	sol = cur_pos = buf;
diff --git a/usr/src/lib/cfgadm_plugins/ib/common/cfga_conf.c b/usr/src/lib/cfgadm_plugins/ib/common/cfga_conf.c
index a456ba290b..970cd753d8 100644
--- a/usr/src/lib/cfgadm_plugins/ib/common/cfga_conf.c
+++ b/usr/src/lib/cfgadm_plugins/ib/common/cfga_conf.c
@@ -117,7 +117,7 @@ ib_get_var_type(char *str)
 
 	cfgvar = &ibcfg_varlist[0];
 	while (cfgvar->type != IB_NONE) {
-		if (strcasecmp(cfgvar->name, str) == NULL)
+		if (strcasecmp(cfgvar->name, str) == 0)
 			break;
 		else
 			cfgvar++;
diff --git a/usr/src/lib/cfgadm_plugins/ib/common/cfga_ib.c b/usr/src/lib/cfgadm_plugins/ib/common/cfga_ib.c
index e9585ef40a..79bb9a8b7c 100644
--- a/usr/src/lib/cfgadm_plugins/ib/common/cfga_ib.c
+++ b/usr/src/lib/cfgadm_plugins/ib/common/cfga_ib.c
@@ -620,7 +620,7 @@ ib_setup_for_devctl_cmd(char *ap_id, boolean_t use_static_ap_id,
 	char	*apid = (use_static_ap_id == B_TRUE) ? IB_STATIC_APID : ap_id;
 
 	/* Get a handle to the ap */
-	if ((*devctl_hdl = devctl_ap_acquire(apid, NULL)) == NULL) {
+	if ((*devctl_hdl = devctl_ap_acquire(apid, 0)) == NULL) {
 		DPRINTF("ib_setup_for_devctl_cmd: devctl_ap_acquire "
 		    "errno: %d\n", errno);
 		ib_cleanup_after_devctl_cmd(*devctl_hdl, *user_nvlistp);
@@ -628,7 +628,7 @@ ib_setup_for_devctl_cmd(char *ap_id, boolean_t use_static_ap_id,
 	}
 
 	/* Set up to pass dynamic ap_id down to driver */
-	if (nvlist_alloc(user_nvlistp, NV_UNIQUE_NAME_TYPE, NULL) != 0) {
+	if (nvlist_alloc(user_nvlistp, NV_UNIQUE_NAME_TYPE, 0) != 0) {
 		DPRINTF("ib_setup_for_devctl: nvlist_alloc errno: %d\n", errno);
 		*user_nvlistp = NULL;	/* Prevent possible incorrect free in */
 					/* ib_cleanup_after_devctl_cmd */
diff --git a/usr/src/lib/cfgadm_plugins/pci/common/cfga.c b/usr/src/lib/cfgadm_plugins/pci/common/cfga.c
index 6826876f6b..39417d1498 100644
--- a/usr/src/lib/cfgadm_plugins/pci/common/cfga.c
+++ b/usr/src/lib/cfgadm_plugins/pci/common/cfga.c
@@ -1080,7 +1080,7 @@ cfga_private_func(const char *function, const char *ap_id,
 				if ((strncmp(str, func_strs[MODE], len) == 0) &&
 				    (*(str+(len)) == '=')) {
 					for (str = (str+(++len)), i = 0;
-					    *str != NULL; i++, str++) {
+					    *str != '\0'; i++, str++) {
 						buf[i] = *str;
 					}
 				}
@@ -1277,7 +1277,7 @@ find_physical_slot_names(const char *devcomp, struct searcharg *slotarg)
 
 	if ((root_node = di_init("/", DINFOCPYALL|DINFOPATH)) == DI_NODE_NIL) {
 		DBG(1, ("di_init() failed\n"));
-		return (NULL);
+		return (-1);
 	}
 
 	slotarg->devpath = (char *)devcomp;
@@ -1285,7 +1285,7 @@ find_physical_slot_names(const char *devcomp, struct searcharg *slotarg)
 	if ((slotarg->promp = di_prom_init()) == DI_PROM_HANDLE_NIL) {
 		DBG(1, ("di_prom_init() failed\n"));
 		di_fini(root_node);
-		return (NULL);
+		return (-1);
 	}
 
 	(void) di_walk_minor(root_node, "ddi_ctl:attachment_point:pci",
diff --git a/usr/src/lib/cfgadm_plugins/sata/common/cfga_sata.c b/usr/src/lib/cfgadm_plugins/sata/common/cfga_sata.c
index b30433c2be..dd74b7d210 100644
--- a/usr/src/lib/cfgadm_plugins/sata/common/cfga_sata.c
+++ b/usr/src/lib/cfgadm_plugins/sata/common/cfga_sata.c
@@ -608,7 +608,7 @@ cfga_change_state(
 	 * Checking device type. A port multiplier is not configurable - it is
 	 * already configured as soon as it is connected.
 	 */
-	if ((rv = do_control_ioctl(ap_id, SATA_CFGA_GET_AP_TYPE, NULL,
+	if ((rv = do_control_ioctl(ap_id, SATA_CFGA_GET_AP_TYPE, 0,
 	    (void **)&str_type, &size)) != CFGA_SATA_OK) {
 		/* no such deivce */
 		goto bailout;
@@ -985,7 +985,7 @@ cfga_private_func(
 			goto bailout;
 		}
 
-		rv = do_control_ioctl(ap_id, SATA_CFGA_RESET_PORT, NULL,
+		rv = do_control_ioctl(ap_id, SATA_CFGA_RESET_PORT, 0,
 		    (void **)&str_p, &size);
 
 	} else if (strcmp(func, SATA_RESET_DEVICE) == 0) {
@@ -1019,7 +1019,7 @@ cfga_private_func(
 			goto bailout;
 		}
 
-		rv = do_control_ioctl(ap_id, SATA_CFGA_RESET_DEVICE, NULL,
+		rv = do_control_ioctl(ap_id, SATA_CFGA_RESET_DEVICE, 0,
 		    (void **)&str_p, &size);
 
 	} else if (strcmp(func, SATA_RESET_ALL) == 0) {
@@ -1041,7 +1041,7 @@ cfga_private_func(
 			rv = CFGA_SATA_NACK;
 			goto bailout;
 		}
-		rv = do_control_ioctl(ap_id, SATA_CFGA_RESET_ALL, NULL,
+		rv = do_control_ioctl(ap_id, SATA_CFGA_RESET_ALL, 0,
 		    (void **)&str_p, &size);
 
 	} else if (strcmp(func, SATA_PORT_DEACTIVATE) == 0) {
@@ -1063,7 +1063,7 @@ cfga_private_func(
 			goto bailout;
 		}
 
-		rv = do_control_ioctl(ap_id, SATA_CFGA_PORT_DEACTIVATE, NULL,
+		rv = do_control_ioctl(ap_id, SATA_CFGA_PORT_DEACTIVATE, 0,
 		    (void **)&str_p, &size);
 
 	} else if (strcmp(func, SATA_PORT_ACTIVATE) == 0) {
@@ -1086,7 +1086,7 @@ cfga_private_func(
 		}
 
 		rv = do_control_ioctl(ap_id, SATA_CFGA_PORT_ACTIVATE,
-		    NULL, (void **)&str_p, &size);
+		    0, (void **)&str_p, &size);
 		goto bailout;
 
 	} else if (strcmp(func, SATA_PORT_SELF_TEST) == 0) {
@@ -1094,7 +1094,7 @@ cfga_private_func(
 		    strlen(SATA_CONFIRM_DEVICE_SUSPEND) +
 		    strlen("Self Test Port") + strlen(ap_id);
 
-		if ((msg = (char *)calloc(len +3, 1)) != NULL) {
+		if ((msg = calloc(len +3, 1)) != NULL) {
 			(void) snprintf(msg, len +3, "Self Test"
 			    " %s%s\n%s",
 			    SATA_CONFIRM_PORT, ap_id,
@@ -1109,7 +1109,7 @@ cfga_private_func(
 		}
 
 		rv = do_control_ioctl(ap_id, SATA_CFGA_PORT_SELF_TEST,
-		    NULL, (void **)&str_p, &size);
+		    0, (void **)&str_p, &size);
 	} else {
 		/* Unrecognized operation request */
 		rv = CFGA_SATA_HWOPNOTSUPP;
@@ -1561,7 +1561,7 @@ cfga_list_ext(
 	(*ap_id_list)->ap_class[0] = '\0';	/* Filled by libcfgadm */
 	(*ap_id_list)->ap_busy = devctl_ap_state.ap_in_transition;
 	(*ap_id_list)->ap_status_time = devctl_ap_state.ap_last_change;
-	(*ap_id_list)->ap_info[0] = NULL;
+	(*ap_id_list)->ap_info[0] = '\0';
 
 	if ((*ap_id_list)->ap_r_state == CFGA_STAT_CONNECTED) {
 		char *str_p;
@@ -1572,7 +1572,7 @@ cfga_list_ext(
 		 * Model (MOD:)
 		 */
 		if ((rv = do_control_ioctl(ap_id, SATA_CFGA_GET_MODEL_INFO,
-		    NULL, (void **)&str_p, &size)) != CFGA_SATA_OK) {
+		    0, (void **)&str_p, &size)) != CFGA_SATA_OK) {
 			(void) printf(
 			    "SATA_CFGA_GET_MODULE_INFO ioctl failed\n");
 			goto bailout;
@@ -1599,7 +1599,7 @@ cfga_list_ext(
 		 */
 		if ((rv = do_control_ioctl(ap_id,
 		    SATA_CFGA_GET_REVFIRMWARE_INFO,
-		    NULL, (void **)&str_p, &size)) != CFGA_SATA_OK) {
+		    0, (void **)&str_p, &size)) != CFGA_SATA_OK) {
 			(void) printf(
 			    "SATA_CFGA_GET_REVFIRMWARE_INFO ioctl failed\n");
 			goto bailout;
@@ -1626,7 +1626,7 @@ cfga_list_ext(
 		 */
 		if ((rv = do_control_ioctl(ap_id,
 		    SATA_CFGA_GET_SERIALNUMBER_INFO,
-		    NULL, (void **)&str_p, &size)) != CFGA_SATA_OK) {
+		    0, (void **)&str_p, &size)) != CFGA_SATA_OK) {
 			(void) printf(
 			    "SATA_CFGA_GET_SERIALNUMBER_INFO ioctl failed\n");
 			goto bailout;
@@ -1650,7 +1650,7 @@ cfga_list_ext(
 
 		/* Fill in ap_type which is collected from HBA driver */
 		/* call do_control_ioctl TBD */
-		if ((rv = do_control_ioctl(ap_id, SATA_CFGA_GET_AP_TYPE, NULL,
+		if ((rv = do_control_ioctl(ap_id, SATA_CFGA_GET_AP_TYPE, 0,
 		    (void **)&str_p, &size)) != CFGA_SATA_OK) {
 			(void) printf(
 			    "SATA_CFGA_GET_AP_TYPE ioctl failed\n");
@@ -1923,7 +1923,7 @@ setup_for_devctl_cmd(
 	}
 
 	/* Set up nvlist to pass the port number down to the driver */
-	if (nvlist_alloc(user_nvlistp, NV_UNIQUE_NAME_TYPE, NULL) != 0) {
+	if (nvlist_alloc(user_nvlistp, NV_UNIQUE_NAME_TYPE, 0) != 0) {
 		*user_nvlistp = NULL;
 		rv = CFGA_SATA_NVLIST;
 		(void) printf("nvlist_alloc failed\n");
@@ -2105,7 +2105,7 @@ sata_get_devicepath(const char *ap_id)
 	size_t		size;
 	cfga_sata_ret_t	rv;
 
-	rv = do_control_ioctl(ap_id, SATA_CFGA_GET_DEVICE_PATH, NULL,
+	rv = do_control_ioctl(ap_id, SATA_CFGA_GET_DEVICE_PATH, 0,
 	    (void **)&devpath, &size);
 
 	if (rv == CFGA_SATA_OK) {
diff --git a/usr/src/lib/cfgadm_plugins/shp/common/shp.c b/usr/src/lib/cfgadm_plugins/shp/common/shp.c
index 8ca37e1346..587e042fab 100644
--- a/usr/src/lib/cfgadm_plugins/shp/common/shp.c
+++ b/usr/src/lib/cfgadm_plugins/shp/common/shp.c
@@ -954,7 +954,7 @@ cfga_private_func(const char *function, const char *ap_id,
 				if ((strncmp(str, func_strs[MODE], len) == 0) &&
 				    (*(str+(len)) == '=')) {
 					for (str = (str+(++len)), i = 0;
-					    *str != NULL; i++, str++) {
+					    *str != '\0'; i++, str++) {
 						buf[i] = *str;
 					}
 				}
diff --git a/usr/src/lib/cfgadm_plugins/usb/common/cfga_configfile.c b/usr/src/lib/cfgadm_plugins/usb/common/cfga_configfile.c
index ba93564b2d..5750f5d462 100644
--- a/usr/src/lib/cfgadm_plugins/usb/common/cfga_configfile.c
+++ b/usr/src/lib/cfgadm_plugins/usb/common/cfga_configfile.c
@@ -24,8 +24,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include "cfga_usb.h"
 
 
@@ -117,15 +115,15 @@ static int
 get_string(u_longlong_t *llptr, char *tchar)
 {
 	register char *cp;
-	register char *start = (char *)0;
+	register char *start = NULL;
 	register int len = 0;
 
 	len = strlen(tchar);
 	start = tchar;
 	/* copy string */
-	cp = (char *)calloc(len + 1, sizeof (char));
-	if (cp == (char *)NULL) {
-		*llptr = NULL;
+	cp = calloc(len + 1, sizeof (char));
+	if (cp == NULL) {
+		*llptr = 0;
 
 		return (0);
 	}
@@ -256,7 +254,7 @@ usb_get_var_type(char *str)
 
 	cfgvar = &usbcfg_varlist[0];
 	while (cfgvar->field != USB_NONE) {
-		if (strcasecmp(cfgvar->name, str) == NULL) {
+		if (strcasecmp(cfgvar->name, str) == 0) {
 			break;
 		} else {
 			cfgvar++;
diff --git a/usr/src/lib/cfgadm_plugins/usb/common/cfga_usb.c b/usr/src/lib/cfgadm_plugins/usb/common/cfga_usb.c
index cfb0b63232..12e144af82 100644
--- a/usr/src/lib/cfgadm_plugins/usb/common/cfga_usb.c
+++ b/usr/src/lib/cfgadm_plugins/usb/common/cfga_usb.c
@@ -530,7 +530,7 @@ setup_for_devctl_cmd(const char *ap_id, devctl_hdl_t *devctl_hdl,
 	}
 
 	/* Set up to pass port number down to driver */
-	if (nvlist_alloc(user_nvlistp, NV_UNIQUE_NAME_TYPE, NULL) != 0) {
+	if (nvlist_alloc(user_nvlistp, NV_UNIQUE_NAME_TYPE, 0) != 0) {
 		DPRINTF("setup_for_devctl: nvlist_alloc failed, errno: %d\n",
 		    errno);
 		*user_nvlistp = NULL;	/* Prevent possible incorrect free in */
@@ -803,7 +803,7 @@ set_configuration(const char *ap_id, uint_t config, char *driver,
 	}
 
 	/* Notify hubd that it needs to refresh its db.  */
-	if ((rv = do_control_ioctl(ap_id, HUBD_REFRESH_DEVDB, NULL,
+	if ((rv = do_control_ioctl(ap_id, HUBD_REFRESH_DEVDB, 0,
 	    (void **)&dev_path, &size)) != CFGA_USB_OK) {
 		DPRINTF("set_configuration: HUBD_REFRESH_DEVDB failed\n");
 		goto bailout;
@@ -832,7 +832,7 @@ get_config(const char *ap_id, uint_t *config)
 	uint_t		*config_val = NULL;
 	cfga_usb_ret_t	rv;
 
-	if ((rv = do_control_ioctl(ap_id, HUBD_GET_CURRENT_CONFIG, NULL,
+	if ((rv = do_control_ioctl(ap_id, HUBD_GET_CURRENT_CONFIG, 0,
 	    (void **)&config_val, &size)) != CFGA_USB_OK) {
 		DPRINTF("get_config: get current config descr failed\n");
 		goto bailout;
@@ -901,7 +901,7 @@ fill_in_ap_info(const char *ap_id, char *info_buf, size_t info_size)
 
 	DPRINTF("fill_in_ap_info:\n");
 
-	if ((rv = do_control_ioctl(ap_id, USB_DESCR_TYPE_DEV, NULL,
+	if ((rv = do_control_ioctl(ap_id, USB_DESCR_TYPE_DEV, 0,
 	    (void **)&dev_descrp, &size)) != CFGA_USB_OK) {
 		DPRINTF("fill_in_ap_info: get dev descr failed\n");
 		return (rv);
@@ -1383,7 +1383,7 @@ cfga_private_func(
 		/*
 		 * Check that the option setting selected is in range.
 		 */
-		if ((rv = do_control_ioctl(ap_id, USB_DESCR_TYPE_DEV, NULL,
+		if ((rv = do_control_ioctl(ap_id, USB_DESCR_TYPE_DEV, 0,
 		    (void **)&dev_descrp, &size)) != CFGA_USB_OK) {
 			DPRINTF("cfga_private_func: get dev descr failed\n");
 			goto bailout;
@@ -1593,7 +1593,7 @@ cfga_list_ext(
 	(*ap_id_list)->ap_class[0] = '\0';	/* Filled by libcfgadm */
 	(*ap_id_list)->ap_busy = devctl_ap_state.ap_in_transition;
 	(*ap_id_list)->ap_status_time = devctl_ap_state.ap_last_change;
-	(*ap_id_list)->ap_info[0] = NULL;
+	(*ap_id_list)->ap_info[0] = '\0';
 
 	if ((*ap_id_list)->ap_r_state == CFGA_STAT_CONNECTED) {
 		char *str_p;
@@ -1607,7 +1607,7 @@ cfga_list_ext(
 		}
 
 		/* Fill in ap_type */
-		if ((rv = do_control_ioctl(ap_id, HUBD_GET_CFGADM_NAME, NULL,
+		if ((rv = do_control_ioctl(ap_id, HUBD_GET_CFGADM_NAME, 0,
 		    (void **)&str_p, &size)) != CFGA_USB_OK) {
 			DPRINTF("cfga_list_ext: do_control_ioctl failed\n");
 			goto bailout;
@@ -1725,7 +1725,7 @@ usb_get_devicepath(const char *ap_id)
 	size_t		size;
 	cfga_usb_ret_t	rv;
 
-	rv = do_control_ioctl(ap_id, HUBD_GET_DEVICE_PATH, NULL,
+	rv = do_control_ioctl(ap_id, HUBD_GET_DEVICE_PATH, 0,
 	    (void **)&devpath, &size);
 
 	if (rv == CFGA_USB_OK) {
@@ -1733,6 +1733,6 @@ usb_get_devicepath(const char *ap_id)
 		return (devpath);
 	} else {
 		DPRINTF("usb_get_devicepath: get device path ioctl failed\n");
-		return ((char *)NULL);
+		return (NULL);
 	}
 }