[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, 5 insertions, 5 deletions

diff --git a/usr/src/cmd/sgs/elfedit/common/elfedit.c b/usr/src/cmd/sgs/elfedit/common/elfedit.c
index 2018d93bdd..8894ef312b 100644
--- a/usr/src/cmd/sgs/elfedit/common/elfedit.c
+++ b/usr/src/cmd/sgs/elfedit/common/elfedit.c
@@ -268,7 +268,7 @@ elfedit_msg(elfedit_msg_t type, const char *format, ...)
 {
 	typedef enum {			/* What to do after finished */
 		DISP_RET = 0,		/* Return to caller */
-		DISP_JMP = 1, 		/* if (interactive) longjmp else exit */
+		DISP_JMP = 1,		/* if (interactive) longjmp else exit */
 		DISP_EXIT = 2		/* exit under all circumstances */
 	} DISP;
 
@@ -1420,7 +1420,7 @@ path_is_so(const char *path)
 static const char *
 elfedit_basename(const char *path, const char *tail, char *buf, size_t bufsiz)
 {
-	const char 	*s;
+	const char	*s;
 
 	if (tail == NULL)
 		tail = path + strlen(path);
@@ -1676,7 +1676,7 @@ validate_optarg(elfedit_cmd_optarg_t *optarg, int isopt, MODLIST_T *moddef,
 				/* MSG_INTL(MSG_ERR_CMDOA_VALNAM) */
 				FAIL(MSG_ERR_CMDOA_VALNAM);
 			}
-			if ((oa1->oa_help != NULL) || (oa1->oa_flags != 0) ||
+			if ((oa1->oa_help != 0) || (oa1->oa_flags != 0) ||
 			    (oa1->oa_idmask != 0) || (oa1->oa_excmask != 0)) {
 				/* MSG_INTL(MSG_ERR_CMDOA_VALNOT0) */
 				FAIL(MSG_ERR_CMDOA_VALNOT0);
@@ -1977,7 +1977,7 @@ elfedit_load_moddir(const char *dirpath, int must_exist, int abs_path)
 	char		path[PATH_MAX + 1];
 	DIR		*dir;
 	struct dirent	*dp;
-	const char 	*tail;
+	const char	*tail;
 
 	dir = opendir(dirpath);
 	if (dir == NULL) {
@@ -3225,7 +3225,7 @@ cmd_match_fcn(WordCompletion *cpl, void *data, const char *line, int word_end)
 		}
 		skip_one = 0;
 		ostyle_ndx = -1;
-		if ((strcmp(argv[i], MSG_ORIG(MSG_STR_MINUS_MINUS)) == NULL) ||
+		if ((strcmp(argv[i], MSG_ORIG(MSG_STR_MINUS_MINUS)) == 0) ||
 		    (*argv[i] != '-')) {
 			opt_term_seen = 1;
 			continue;