[illumos-gate merge]

commit 621caade37fe7b1fa94c61ab3f3ef03c38bbdc2e
    11388 lockstat: NULL pointer errors
commit d4d37f1b7f62fa7bc9abd7dcd34bc6d85dac69af
    11387 look: NULL pointer errors
commit 0babfc55a001a1a55719ffeced558ec05d5ec38c
    11386 luxadm: NULL pointer errors
commit 1a3a3bd4960cef8c34aa04b4daa125a5efc415f3
    11383 listen: NULL pointer errors
commit c59d9dff034f6cf5330aceb38bb1757d01e3904e
    11382 ldap: NULL pointer errors
commit 01d6bbace7ed9d92acc6fd5dfcb2b18c2dd18e85
commit bf8679989f3c88a5ddb26dd955ca2dd4a52bc2d5
    11473 SPARC build warns about unpackaged files
commit 370566791023855edd09eaa76dd783d93fb60cfe
    11474 usr/src/cmd/devfsadm/Makefile.com has an SVM remnant

21 files changed, 88 insertions, 123 deletions

diff --git a/exception_lists/packaging b/exception_lists/packaging
index d1394c3e84..7ced98f1e0 100644
--- a/exception_lists/packaging
+++ b/exception_lists/packaging
@@ -869,11 +869,12 @@ usr/bin/ctfmerge
 # SPARC doesn't currently use this today, though it may in the future.
 #
 usr/include/sys/sensors.h	sparc
+usr/lib/devfsadm/linkmod/SUNW_sensor_link.so	sparc
 
 #
 # libjedec is private
 #
-usr/include/libjedec.h		i386
+usr/include/libjedec.h
 usr/lib/amd64/libjedec.so	i386
 usr/lib/sparcv9/libjedec.so	sparc
 usr/lib/libjedec.so
diff --git a/usr/src/cmd/devfsadm/Makefile.com b/usr/src/cmd/devfsadm/Makefile.com
index cec58108c8..17129c7d7b 100644
--- a/usr/src/cmd/devfsadm/Makefile.com
+++ b/usr/src/cmd/devfsadm/Makefile.com
@@ -107,7 +107,6 @@ SMATCH=off
 # Define the dependencies required by devfsadm and all shared objects.
 LDLIBS +=		-ldevinfo
 devfsadm :=		LDLIBS += -lgen -lsysevent -lnvpair -lzonecfg -lbsm
-SUNW_md_link.so :=	LDLIBS += -lmeta
 SUNW_disk_link.so :=	LDLIBS += -ldevid
 SUNW_sgen_link.so :=	LDLIBS += -ldevid
 
diff --git a/usr/src/cmd/ldap/ns_ldap/ldapaddent.c b/usr/src/cmd/ldap/ns_ldap/ldapaddent.c
index e4a645636a..6c4e83f0b9 100644
--- a/usr/src/cmd/ldap/ns_ldap/ldapaddent.c
+++ b/usr/src/cmd/ldap/ns_ldap/ldapaddent.c
@@ -144,7 +144,7 @@ again:
 		else
 			base = 8;
 	}
-	while ((c = *cp) != NULL) {
+	while ((c = *cp) != '\0') {
 		if (isdigit(c)) {
 			if ((c - '0') >= base)
 				break;
@@ -463,7 +463,8 @@ addentry(void *entry, int mod)
  * Display usage message to STDERR.
  */
 static void
-usage(char *msg) {
+usage(char *msg)
+{
 
 	if (msg)
 		(void) fprintf(stderr, "%s\n", msg);
@@ -508,7 +509,8 @@ usage(char *msg) {
  *		AF_INET6	: IPv6
  */
 static int
-check_ipaddr(char *addr, char **newaddr) {
+check_ipaddr(char *addr, char **newaddr)
+{
 	ipaddr_t	addr_ipv4 = 0;
 	in6_addr_t	addr_ipv6;
 
@@ -519,7 +521,7 @@ check_ipaddr(char *addr, char **newaddr) {
 
 		/* Convert IPv4-mapped IPv6 address to IPv4 */
 		if (IN6_IS_ADDR_V4MAPPED(&addr_ipv6) ||
-					IN6_IS_ADDR_V4COMPAT(&addr_ipv6)) {
+		    IN6_IS_ADDR_V4COMPAT(&addr_ipv6)) {
 			IN6_V4MAPPED_TO_IPADDR(&addr_ipv6, addr_ipv4);
 			if ((*newaddr = calloc(1, INET_ADDRSTRLEN)) == NULL) {
 				(void) fprintf(stderr,
@@ -2167,7 +2169,7 @@ dump_aliases(ns_ldap_result_t *res)
 {
 
 	char	**value = NULL;
-	int 		attr_count = 0;
+	int		attr_count = 0;
 
 	value = __ns_ldap_getAttr(res->entry, "mail");
 	if (value && value[0])
@@ -3819,8 +3821,8 @@ static void
 dump_project(ns_ldap_result_t *res)
 {
 	char    **value = NULL;
-	char 	*endptr = NULL;
-	int 	projid;
+	char	*endptr = NULL;
+	int	projid;
 
 	if (res == NULL || res->entry == NULL)
 		return;
@@ -4721,7 +4723,8 @@ static int get_basedn(char *service, char **basedn) {
 	}
 }
 static char *
-h_errno2str(int h_errno) {
+h_errno2str(int h_errno)
+{
 	switch (h_errno) {
 	case HOST_NOT_FOUND:
 		return ("HOST_NOT_FOUND");
diff --git a/usr/src/cmd/ldap/ns_ldap/ldaplist.c b/usr/src/cmd/ldap/ns_ldap/ldaplist.c
index 162639d119..1ed200938a 100644
--- a/usr/src/cmd/ldap/ns_ldap/ldaplist.c
+++ b/usr/src/cmd/ldap/ns_ldap/ldaplist.c
@@ -75,12 +75,12 @@ static struct database_t {
 
 
 void
-usage(char *msg) {
+usage(char *msg)
+{
 	if (msg)
 		(void) fprintf(stderr, "%s\n", msg);
 
-	(void) fprintf(stderr,
-	gettext(
+	(void) fprintf(stderr, gettext(
 	"\n"
 	"usage: ldaplist [-dlv] [-h LDAP_server[:serverPort] [-M domainName]\n"
 	"[-N  profileName] [-a  authenticationMethod] [-P certifPath]\n"
@@ -144,9 +144,8 @@ usage(char *msg) {
  * filter, if the input SSD contains a filter "department=sds".
  */
 static int
-merge_SSD_filter(const ns_ldap_search_desc_t *desc,
-			char **realfilter,
-			const void *userdata)
+merge_SSD_filter(const ns_ldap_search_desc_t *desc, char **realfilter,
+    const void *userdata)
 {
 	int	len;
 	char *checker;
@@ -189,13 +188,13 @@ merge_SSD_filter(const ns_ldap_search_desc_t *desc,
 /* returns 0=success, 1=error */
 int
 list(char *database, char *ldapfilter, char **ldapattribute,
-char **err, char *userdata)
+    char **err, char *userdata)
 {
 	ns_ldap_result_t	*result;
 	ns_ldap_error_t	*errorp;
 	int		rc;
 	char		buf[500];
-	const char 	*sort = NULL;
+	const char	*sort = NULL;
 	int		i;
 
 	if (database) {
@@ -260,7 +259,7 @@ main(int argc, char **argv)
 	char			*attribute = "dn";
 	char			**key = NULL;
 	char			**ldapattribute = NULL;
-	char 			*buffer[100];
+	char			*buffer[100];
 	char			*err = NULL;
 	char			*p;
 	int			index = 1;
@@ -488,7 +487,7 @@ main(int argc, char **argv)
 	}
 
 	/* build the filter */
-	if (database && (strcasecmp(database, "publickey") == NULL)) {
+	if (database && (strcasecmp(database, "publickey") == 0)) {
 		/* user publickey lookup */
 		char *err1 = NULL;
 		int  rc1;
diff --git a/usr/src/cmd/listen/lsdbf.c b/usr/src/cmd/listen/lsdbf.c
index 56efe2ec6c..5983b020a0 100644
--- a/usr/src/cmd/listen/lsdbf.c
+++ b/usr/src/cmd/listen/lsdbf.c
@@ -29,8 +29,6 @@
 /*	  All Rights Reserved  	*/
 
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*
  * data base routines for the network listener process
  */
@@ -532,7 +530,7 @@ int mflag;
 		DEBUG((9,"scan_line failed svc_code strchr"));
 		return(0);
 	}
-	*p = NULL;
+	*p = '\0';
 	*svc_code_p = bp;
 	nexttok = ++p;
 
@@ -540,7 +538,7 @@ int mflag;
 		DEBUG((9,"scan_line failed flags strchr"));
 		return(0);
 	}
-	*p = NULL;
+	*p = '\0';
 
 	while (*nexttok)  {
 		switch (*nexttok)  {
@@ -564,7 +562,7 @@ int mflag;
 		DEBUG((9,"scan_line failed id strchr"));
 		return(0);
 	}
-	*p = NULL;
+	*p = '\0';
 	*id_p = nexttok;
 	nexttok = ++p;
 
@@ -572,7 +570,7 @@ int mflag;
 		DEBUG((9,"scan_line failed res1 strchr"));
 		return(0);
 	}
-	*p = NULL;
+	*p = '\0';
 	*res1_p = nexttok;
 	nexttok = ++p;
 
@@ -580,7 +578,7 @@ int mflag;
 		DEBUG((9,"scan_line failed res2 strchr"));
 		return(0);
 	}
-	*p = NULL;
+	*p = '\0';
 	*res2_p = nexttok;
 	nexttok = ++p;
 
@@ -588,7 +586,7 @@ int mflag;
 		DEBUG((9,"scan_line failed res3 strchr"));
 		return(0);
 	}
-	*p = NULL;
+	*p = '\0';
 	*res3_p = nexttok;
 	nexttok = ++p;
 
@@ -596,7 +594,7 @@ int mflag;
 		DEBUG((9,"scan_line failed private strchr"));
 		return(0);
 	}
-	*p = NULL;
+	*p = '\0';
 	*private_p = nexttok;
 	nexttok = ++p;
 
@@ -604,7 +602,7 @@ int mflag;
 		DEBUG((9,"scan_line failed rpc strchr"));
 		return(0);
 	}
-	*p = NULL;
+	*p = '\0';
 
 	*prognum = -1;
 	*vernum = -1;
@@ -658,7 +656,7 @@ int mflag;
 		DEBUG((9,"scan_line failed sflags strchr"));
 		return(0);
 	}
-	*p = NULL;
+	*p = '\0';
 
 	*sflags = 0;
 	while (*nexttok)  {
@@ -698,7 +696,7 @@ int mflag;
 		DEBUG((9,"scan_line failed module strchr"));
 		return(0);
 	}
-	*p = NULL;
+	*p = '\0';
 	*module_p = nexttok;
 	nexttok = ++p;
 
@@ -914,7 +912,7 @@ register char *mp;
 	extern int errno;
 
 	DEBUG((9,"in pushmod:"));
-	if (!mp || *mp == NULL) {
+	if (!mp || *mp == '\0') {
 		DEBUG((9,"NULL list: exiting pushmod"));
 		return(0);
 	}
diff --git a/usr/src/cmd/lockstat/sym.c b/usr/src/cmd/lockstat/sym.c
index a4a5080428..537e55536f 100644
--- a/usr/src/cmd/lockstat/sym.c
+++ b/usr/src/cmd/lockstat/sym.c
@@ -24,8 +24,6 @@
  * All rights reserved.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <stdio.h>
 #include <fcntl.h>
 #include <ctype.h>
@@ -235,7 +233,7 @@ sym_to_addr(char *name)
 			return (sep->addr);
 		sep++;
 	}
-	return (NULL);
+	return ((uintptr_t)NULL);
 }
 
 size_t
diff --git a/usr/src/cmd/look/look.c b/usr/src/cmd/look/look.c
index d0b77a7cc5..9c5d1dbce7 100644
--- a/usr/src/cmd/look/look.c
+++ b/usr/src/cmd/look/look.c
@@ -4,15 +4,13 @@
  */
 
 /*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
-/*	  All Rights Reserved  	*/
+/*	  All Rights Reserved	*/
 
 /*
  * Copyright (c) 1980 Regents of the University of California.
  * All rights reserved. The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  */
-     
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 #include <stdio.h>
 #include <ctype.h>
@@ -77,7 +75,7 @@ main(int argc, char **argv)
 		exit(2);
 	}
 	wstring = strdup(argv[1]);
-	if (tab != NULL) {
+	if (tab != 0) {
 		if ((ptr = strchr(wstring, tab)) != NULL) {
 			*++ptr = '\0';
 		}
diff --git a/usr/src/cmd/luxadm/fabric_conf.c b/usr/src/cmd/luxadm/fabric_conf.c
index 2a7611f319..4903979f19 100644
--- a/usr/src/cmd/luxadm/fabric_conf.c
+++ b/usr/src/cmd/luxadm/fabric_conf.c
@@ -68,12 +68,11 @@ log_error(char *msg_id, char *input_tmplt, ...)
 	va_end(ap);
 
 	merged_msg = (char *)malloc(strlen(msg_template) +
-		strlen(input_merged_msg) +
-		strlen(msg_id) + 1);
+	    strlen(input_merged_msg) +
+	    strlen(msg_id) + 1);
 	if (merged_msg == NULL) {
-		syslog(LOG_ERR,
-		"ID[luxadm.create_fabric_device.2317] "
-			"malloc failure, %s", strerror(errno));
+		syslog(LOG_ERR, "ID[luxadm.create_fabric_device.2317] "
+		    "malloc failure, %s", strerror(errno));
 	} else {
 		sprintf(merged_msg, msg_template, msg_id, input_merged_msg);
 			/* first insert msg_id */
@@ -101,10 +100,10 @@ read_repos_file(char *repos_filename)
 	unsigned int filesize;
 	unsigned int bytes_read;
 
-	if (repos_filename == NULL || *repos_filename == NULL) {
+	if (repos_filename == NULL || *repos_filename == '\0') {
 		log_error("2310",
-		"filename missing for -f option of "
-		"luxadm -e create_fabric_device");
+		    "filename missing for -f option of "
+		    "luxadm -e create_fabric_device");
 		return (-1);
 	}
 
@@ -112,26 +111,24 @@ read_repos_file(char *repos_filename)
 
 	if (fd == -1) {
 		log_error("2311",
-		"fopen failed: cannot open repository file %s. %d",
-		repos_filename, strerror(errno));
+		    "fopen failed: cannot open repository file %s. %d",
+		    repos_filename, strerror(errno));
 		return (-1);
 	}
 
 	if (fstat(fd, &stbuf) == -1) {
 		close(fd);
-		log_error("2312",
-		"stat failed on file %s. %s",
-		repos_filename, strerror(errno));
+		log_error("2312", "stat failed on file %s. %s",
+		    repos_filename, strerror(errno));
 		return (-1);
 	}
 	filesize = stbuf.st_size;
 	tmp_ptr = mmap_ptr = mmap((caddr_t)0, filesize,
-			(PROT_READ | PROT_WRITE), MAP_PRIVATE, fd, 0);
+	    (PROT_READ | PROT_WRITE), MAP_PRIVATE, fd, 0);
 
 	if (mmap_ptr == MAP_FAILED) {
-		log_error("2315",
-		"Failed to mmap file %s. %s",
-		repos_filename, strerror(errno));
+		log_error("2315", "Failed to mmap file %s. %s",
+		    repos_filename, strerror(errno));
 		return (-1);
 	}
 
@@ -143,7 +140,7 @@ read_repos_file(char *repos_filename)
 			tmp_ptr++;
 		}
 		if (*tmp_ptr == '\n') {
-			*tmp_ptr = NULL;
+			*tmp_ptr = '\0';
 			tmp_ptr++;
 			bytes_read++;
 		}
@@ -184,22 +181,21 @@ parse_line(char *line, char *path, char *wwn, char *filename)
 
 	line_copy = strdup(line);
 	if (line_copy == NULL) {
-		log_error("2317",
-			"malloc failure, %s", strerror(errno));
+		log_error("2317", "malloc failure, %s", strerror(errno));
 	}
 	p_path = line_copy;
 	p_delim = strstr(p_path, WWN_DELIM);
 	if (p_delim == NULL) {
 		log_error("2313",
-			"Invalid line (%s) in file %s.", line, filename);
+		    "Invalid line (%s) in file %s.", line, filename);
 		free(line_copy);
 		return (-1);
 	}
-	*p_delim = NULL;	/* NULL terminate path */
+	*p_delim = '\0';	/* NULL terminate path */
 
 	if (strlcpy(path, p_path, MAXPATHLEN) >= MAXPATHLEN) {
 		log_error("2318",
-			"Path too long (%s) in file %s.", p_path, filename);
+		    "Path too long (%s) in file %s.", p_path, filename);
 		free(line_copy);
 		return (-1);
 	}
@@ -215,12 +211,12 @@ parse_line(char *line, char *path, char *wwn, char *filename)
 	p_delim = strchr(p_wwn, ' ');
 	if (p_delim != NULL) {
 		/* now p_delim points to blank */
-		*p_delim = NULL;	/* terminate wwn at delim */
+		*p_delim = '\0';	/* terminate wwn at delim */
 	} else {
 		char *p_last_char;
 		p_last_char = p_wwn+strlen(p_wwn)-1;
 		if (*p_last_char == '\n') {
-			*p_last_char = NULL;
+			*p_last_char = '\0';
 		}
 	}
 	strcpy(wwn, p_wwn);
@@ -280,7 +276,7 @@ string_to_wwn(const uchar_t *string, uchar_t *port_wwn)
 
 static int
 create_ap_instance(char *ap_id, char *wwn_string,
-		    char *filename, char *line)
+    char *filename, char *line)
 {
 	devctl_hdl_t bus_handle, dev_handle;
 	devctl_ddef_t ddef_handle;
@@ -290,9 +286,8 @@ create_ap_instance(char *ap_id, char *wwn_string,
 	ddef_handle = devctl_ddef_alloc("dummy", 0);
 	if (ddef_handle == NULL) {
 		log_error("2314",
-		"Internal error to process line (%s) "
-		"in file: %s. %s",
-		line, filename, strerror(errno));
+		    "Internal error to process line (%s) in file: %s. %s",
+		    line, filename, strerror(errno));
 		return (-1);
 	}
 	/*
@@ -301,21 +296,19 @@ create_ap_instance(char *ap_id, char *wwn_string,
 	 */
 	if (string_to_wwn((uchar_t *)wwn_string, wwn_array) != 0) {
 		log_error("2314",
-		"Internal error to process line (%s) "
-		"in file: %s. %s",
-		line, filename, strerror(errno));
+		    "Internal error to process line (%s) in file: %s. %s",
+		    line, filename, strerror(errno));
 		devctl_ddef_free(ddef_handle);
 		return (-1);
 	}
 	(void) devctl_ddef_byte_array(ddef_handle,
-		"port-wwn", FC_WWN_SIZE, wwn_array);
+	    "port-wwn", FC_WWN_SIZE, wwn_array);
 
 	if ((bus_handle = devctl_bus_acquire(ap_id, 0)) == NULL) {
 		devctl_ddef_free(ddef_handle);
 		log_error("2314",
-		"Internal error to process line (%s) "
-		"in file: %s. %s",
-		line, filename, strerror(errno));
+		    "Internal error to process line (%s) in file: %s. %s",
+		    line, filename, strerror(errno));
 		return (-1);
 	}
 	if (ret =
@@ -323,9 +316,8 @@ create_ap_instance(char *ap_id, char *wwn_string,
 		devctl_ddef_free(ddef_handle);
 		devctl_release(bus_handle);
 		log_error("2316",
-		"configuration failed for line (%s) "
-		"in file: %s. %s",
-		line, filename, strerror(errno));
+		    "configuration failed for line (%s) in file: %s. %s",
+		    line, filename, strerror(errno));
 		return (-1);
 	}
 	devctl_release(dev_handle);
diff --git a/usr/src/cmd/luxadm/lux_util.c b/usr/src/cmd/luxadm/lux_util.c
index 3c731383e1..ac408704c5 100644
--- a/usr/src/cmd/luxadm/lux_util.c
+++ b/usr/src/cmd/luxadm/lux_util.c
@@ -281,7 +281,7 @@ scsi_find_command_name(int cmd)
 
 static void
 scsi_printerr(struct uscsi_cmd *ucmd, struct scsi_extended_sense *rq,
-		int rqlen, char msg_string[], char *err_string)
+    int rqlen, char msg_string[], char *err_string)
 {
 	int		blkno;
 
@@ -608,11 +608,8 @@ retry:
  *		page_code = Pages to return
  */
 int
-scsi_mode_sense_cmd(int fd,
-	uchar_t *buf_ptr,
-	int buf_len,
-	uchar_t pc,
-	uchar_t page_code)
+scsi_mode_sense_cmd(int fd, uchar_t *buf_ptr, int buf_len, uchar_t pc,
+    uchar_t page_code)
 {
 	struct uscsi_cmd	ucmd;
 	/* 10 byte Mode Select cmd */
@@ -716,7 +713,7 @@ scsi_reserve(char *path)
  */
 void
 print_fabric_dtype_prop(uchar_t *hba_port_wwn, uchar_t *port_wwn,
-	uchar_t dtype_prop)
+    uchar_t dtype_prop)
 {
 	if ((dtype_prop & DTYPE_MASK) < 0x10) {
 		(void) fprintf(stdout, " 0x%-2x (%s)\n",
@@ -914,7 +911,7 @@ print_inq_data(char *arg_path, char *path, L_inquiry inq, uchar_t *serial,
 	(void) fprintf(stdout, ")\n");
 
 	(void) fprintf(stdout, "%s", *p++);
-	if (inq.inq_rmb != NULL) {
+	if (inq.inq_rmb != 0) {
 		(void) fprintf(stdout, MSGSTR(40, "yes"));
 	} else {
 		(void) fprintf(stdout, MSGSTR(45, "no"));
@@ -923,7 +920,7 @@ print_inq_data(char *arg_path, char *path, L_inquiry inq, uchar_t *serial,
 
 	if (scsi_3) {
 		(void) fprintf(stdout, "%s", *p++);
-		if (inq.inq_mchngr != NULL) {
+		if (inq.inq_mchngr != 0) {
 			(void) fprintf(stdout, MSGSTR(40, "yes"));
 		} else {
 			(void) fprintf(stdout, MSGSTR(45, "no"));
@@ -950,7 +947,7 @@ print_inq_data(char *arg_path, char *path, L_inquiry inq, uchar_t *serial,
 	}
 	if (scsi_3) {
 		(void) fprintf(stdout, "%s", *p++);
-		if (inq.inq_normaca != NULL) {
+		if (inq.inq_normaca != 0) {
 			(void) fprintf(stdout, MSGSTR(40, "yes"));
 		} else {
 			(void) fprintf(stdout, MSGSTR(45, "no"));
@@ -968,7 +965,7 @@ print_inq_data(char *arg_path, char *path, L_inquiry inq, uchar_t *serial,
 	(void) fprintf(stdout, "%s0x%x\n", *p++, inq.inq_len);
 	if (scsi_3) {
 		if (inq.inq_dual_p) {
-			if (inq.inq_port != NULL) {
+			if (inq.inq_port != 0) {
 				(void) fprintf(stdout, MSGSTR(2187,
 				    "%sa\n"), *p++);
 			} else {
@@ -1029,7 +1026,7 @@ print_inq_data(char *arg_path, char *path, L_inquiry inq, uchar_t *serial,
 
 	if (scsi_3) {
 		(void) fprintf(stdout, "%s", *p++);
-		if (inq.ui.inq_3.inq_trandis != NULL) {
+		if (inq.ui.inq_3.inq_trandis != 0) {
 			(void) fprintf(stdout, MSGSTR(40, "yes"));
 		} else {
 			(void) fprintf(stdout, MSGSTR(45, "no"));
@@ -1362,19 +1359,19 @@ get_scsi_vhci_pathinfo(char *dev_path, sv_iocdata_t *ioc, int *path_count)
 	int	fd;
 	int	initial_path_count;
 	int	current_path_count;
-	int 	i;
+	int	i;
 	char	*delimiter;
 	int	malloc_error = 0;
-	int 	prop_buf_size;
+	int	prop_buf_size;
 	int	pathlist_retry_count = 0;
 
-	if (strncmp(dev_path, SCSI_VHCI, strlen(SCSI_VHCI)) != NULL) {
+	if (strncmp(dev_path, SCSI_VHCI, strlen(SCSI_VHCI)) != 0) {
 		if ((physical_path = get_slash_devices_from_osDevName(
 		    dev_path, STANDARD_DEVNAME_HANDLING)) == NULL) {
 			return (L_INVALID_PATH);
 		}
 		if (strncmp(physical_path, SCSI_VHCI,
-		    strlen(SCSI_VHCI)) != NULL) {
+		    strlen(SCSI_VHCI)) != 0) {
 			free(physical_path);
 			return (L_INVALID_PATH);
 		}
@@ -1392,7 +1389,7 @@ get_scsi_vhci_pathinfo(char *dev_path, sv_iocdata_t *ioc, int *path_count)
 	delimiter = strrchr(physical_path, ':');
 	/* if we didn't find the ':' fine, else truncate */
 	if (delimiter != NULL) {
-		*delimiter = NULL;
+		*delimiter = '\0';
 	}
 
 	/*
diff --git a/usr/src/lib/iconv_modules/Makefile b/usr/src/lib/iconv_modules/Makefile
index e8ec6dc252..a881735665 100644
--- a/usr/src/lib/iconv_modules/Makefile
+++ b/usr/src/lib/iconv_modules/Makefile
@@ -35,8 +35,6 @@ clobber		:=	TARGET = clobber
 
 all install lint clean clobber: $(SUBDIRS)
 
-.PARALLEL: $(SUBDIRS)
-
 $(SUBDIRS): FRC
 	cd $@; $(MAKE) $(TARGET)
 
diff --git a/usr/src/lib/iconv_modules/common/Makefile b/usr/src/lib/iconv_modules/common/Makefile
index eaa4f5a9f1..da26c3adf1 100644
--- a/usr/src/lib/iconv_modules/common/Makefile
+++ b/usr/src/lib/iconv_modules/common/Makefile
@@ -39,8 +39,6 @@ echo :=         TARGET = echo
 
 all clean clobber install lint echo: $(SUBDIRS)
 
-.PARALLEL: $(SUBDIRS)
-
 $(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
diff --git a/usr/src/lib/iconv_modules/euro/Makefile b/usr/src/lib/iconv_modules/euro/Makefile
index eaa4f5a9f1..da26c3adf1 100644
--- a/usr/src/lib/iconv_modules/euro/Makefile
+++ b/usr/src/lib/iconv_modules/euro/Makefile
@@ -39,8 +39,6 @@ echo :=         TARGET = echo
 
 all clean clobber install lint echo: $(SUBDIRS)
 
-.PARALLEL: $(SUBDIRS)
-
 $(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
diff --git a/usr/src/lib/iconv_modules/euro/Makefile.com b/usr/src/lib/iconv_modules/euro/Makefile.com
index c51372dcad..444be97b64 100644
--- a/usr/src/lib/iconv_modules/euro/Makefile.com
+++ b/usr/src/lib/iconv_modules/euro/Makefile.com
@@ -44,18 +44,18 @@ include $(SRC)/lib/iconv_modules/Makefile.iconv
 
 LDFLAGS = $(DYNFLAGS) $(LDLIBS)
 
-CFLAGS		+= $(XREGSFLAG) -D_REENTRANT
+CFLAGS		+= $(INCLUDES) $(XREGSFLAG) -D_REENTRANT
 
-CLEANFILES +=	tbl.h
+CLEANFILES +=	core ../common/tbl.h
 
-$(ALL_SOS): ../common/euro.h ../common/euro.c tbl.h
+$(ALL_SOS): ../common/euro.h ../common/euro.c ../common/tbl.h
 	TABLE=`echo $@ | $(TR) -d "-" | sed -e s:%:_:g | /usr/bin/cut -d. -f1` ; \
-	$(CC) $(CFLAGS) $(CPPFLAGS) -DT_$$TABLE ../common/euro.c -c -o $@.o ; \
+	$(CC) $(CFLAGS) -DT_$$TABLE ../common/euro.c -c -o $@.o ; \
 	$(LD) $(LDFLAGS) -o $@ $@.o $(LDLIBS)
 	$(POST_PROCESS_SO)
 
-tbl.h: ../genincl $(TABLES:%=../tbls/%)
-	(cd ..; ./genincl) > $@
+../common/tbl.h: ../genincl $(TABLES:%=../tbls/%)
+	cd ..; ./genincl > common/tbl.h
 
 $(CREATE_LINKS):  $(ICONV_LINK_TARGETS)
 	$(SYMLINK) -f 646%8859-1.so $(ICONV_DIR)/646%8859-15.so
diff --git a/usr/src/lib/iconv_modules/hi_IN/Makefile b/usr/src/lib/iconv_modules/hi_IN/Makefile
index eaa4f5a9f1..da26c3adf1 100644
--- a/usr/src/lib/iconv_modules/hi_IN/Makefile
+++ b/usr/src/lib/iconv_modules/hi_IN/Makefile
@@ -39,8 +39,6 @@ echo :=         TARGET = echo
 
 all clean clobber install lint echo: $(SUBDIRS)
 
-.PARALLEL: $(SUBDIRS)
-
 $(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
diff --git a/usr/src/lib/iconv_modules/ja/Makefile b/usr/src/lib/iconv_modules/ja/Makefile
index eaa4f5a9f1..da26c3adf1 100644
--- a/usr/src/lib/iconv_modules/ja/Makefile
+++ b/usr/src/lib/iconv_modules/ja/Makefile
@@ -39,8 +39,6 @@ echo :=         TARGET = echo
 
 all clean clobber install lint echo: $(SUBDIRS)
 
-.PARALLEL: $(SUBDIRS)
-
 $(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
diff --git a/usr/src/lib/iconv_modules/ko/Makefile b/usr/src/lib/iconv_modules/ko/Makefile
index eaa4f5a9f1..da26c3adf1 100644
--- a/usr/src/lib/iconv_modules/ko/Makefile
+++ b/usr/src/lib/iconv_modules/ko/Makefile
@@ -39,8 +39,6 @@ echo :=         TARGET = echo
 
 all clean clobber install lint echo: $(SUBDIRS)
 
-.PARALLEL: $(SUBDIRS)
-
 $(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
diff --git a/usr/src/lib/iconv_modules/th_TH/Makefile b/usr/src/lib/iconv_modules/th_TH/Makefile
index eaa4f5a9f1..da26c3adf1 100644
--- a/usr/src/lib/iconv_modules/th_TH/Makefile
+++ b/usr/src/lib/iconv_modules/th_TH/Makefile
@@ -39,8 +39,6 @@ echo :=         TARGET = echo
 
 all clean clobber install lint echo: $(SUBDIRS)
 
-.PARALLEL: $(SUBDIRS)
-
 $(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
diff --git a/usr/src/lib/iconv_modules/utf-8/Makefile b/usr/src/lib/iconv_modules/utf-8/Makefile
index eaa4f5a9f1..da26c3adf1 100644
--- a/usr/src/lib/iconv_modules/utf-8/Makefile
+++ b/usr/src/lib/iconv_modules/utf-8/Makefile
@@ -39,8 +39,6 @@ echo :=         TARGET = echo
 
 all clean clobber install lint echo: $(SUBDIRS)
 
-.PARALLEL: $(SUBDIRS)
-
 $(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
diff --git a/usr/src/lib/iconv_modules/utf-8/Makefile.com b/usr/src/lib/iconv_modules/utf-8/Makefile.com
index 34e767dc71..2136e0ea66 100644
--- a/usr/src/lib/iconv_modules/utf-8/Makefile.com
+++ b/usr/src/lib/iconv_modules/utf-8/Makefile.com
@@ -38,7 +38,7 @@ GENI_SRCS		= ../common/binarytables/srcs
 include $(SRC)/lib/iconv_modules/Makefile.iconv
 include $(SRC)/lib/iconv_modules/utf-8/Makefile.iconv
 
-CLEANFILES =    *.o *.so *.bt
+CLEANFILES =    *.o *.so core *.bt
 
 .NO_PARALLEL:
 
diff --git a/usr/src/lib/iconv_modules/vi/Makefile b/usr/src/lib/iconv_modules/vi/Makefile
index eaa4f5a9f1..da26c3adf1 100644
--- a/usr/src/lib/iconv_modules/vi/Makefile
+++ b/usr/src/lib/iconv_modules/vi/Makefile
@@ -39,8 +39,6 @@ echo :=         TARGET = echo
 
 all clean clobber install lint echo: $(SUBDIRS)
 
-.PARALLEL: $(SUBDIRS)
-
 $(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
diff --git a/usr/src/lib/iconv_modules/zh/Makefile b/usr/src/lib/iconv_modules/zh/Makefile
index eaa4f5a9f1..da26c3adf1 100644
--- a/usr/src/lib/iconv_modules/zh/Makefile
+++ b/usr/src/lib/iconv_modules/zh/Makefile
@@ -39,8 +39,6 @@ echo :=         TARGET = echo
 
 all clean clobber install lint echo: $(SUBDIRS)
 
-.PARALLEL: $(SUBDIRS)
-
 $(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)