[illumos-gate merge]

commit 974fceab66899bd599db3037669647d0e261838d
    13618 mdb: cast between incompatible function types
commit 24537d3ef87e4452da693fc3143ef18a1a0f3cac
    13617 mdb: variable may be used uninitialized
commit 258f91c6020f3614878f3dcd49df02d9e004de2c
    13527 csh: multiply-defined symbols
commit ffe7853a48540d186f99d86ee9801b5f00135d9c
    13549 vi: multiply-defined symbols
commit a522dae157f0619c63fd51d4b80abc2ded60ec51
    13590 sol_uverbs: implicit conversion from 'ibt_cep_state_t' to 'enum ib_qp_state'
commit 1769817e9676d2db341d2b6828c199f0eabac823
    13620 _lib_version should not be present in mapfile-vers
commit 915894ef19890baaed00080f85f6b69e225cda98
    13508 door_layout() should align the stack to 16 bytes for i386 processes
commit b8ccc4133d4adaea81b30537c9a156ae726b2146
    13519 pkcs11_tpm: symbol 'hPrivateLeafKey' is multiply-defined
commit 20af54a8dfd25497aa77acb3ad11cf1e91b122e9
    13528 bnu: multiply-defined symbols
commit 144488712135c03d546fb15b718e6a21f4f6d4cf
    13550 gprof: multiply-defined symbols
commit 28ab0ca48b3e331cbbb231b1c8325f9f24f9af95
    13551 error: multiply-defined symbols
commit 830ec39e9a3d673fcf5865875006ab471d56b85b
    13553 iasl: multiply-defined symbols
commit 92163adad0f33b8ee626f71225670465b4718da2
    13532 ftp: multiply-defined symbols
commit 835b861bfa01968a312484d1d7bd1798865ea383
    13608 tem: use dynamic array for tab stops
commit ba2848d4cb17292e88f04f6a47e0b3305f17efa7
    13607 loader: tem should use dynamic array for tab stops
commit a11d78d661ddb4b26a53fad39aba982d2bb5a63b
    13531 format: multiply-defined symbols
commit e0dfa398a76c38cdf3380b38117ee2d1ed3249f0
    13525 backup: multiply-defined symbols
commit 3a4671b6f0da381fd0891bf9fe1fcb82176d9897
    13524 cdrw: multiply-defined symbols
commit 9c508120caba0f594e67ae6e1f0ca8a7e3a274e5
    13521 libnisdb: symbol 'ldapConfig' is multiply-defined
commit 518a3de174fca27c87a655a6dab31dc0d75a66a9
    13517 libeti: multiply-defined symbols
commit 288166677c0b62978c976160131a2cc1cf4176b4
    13614 user-level thread swtch panic
commit 431a74760e42d5af1054ef3d5de0e389ea277476
    13580 cpcgen frees bad buffer
commit c45618a5778581b6ec976bf7c034fd7afaa757d7
    13581 geniconvtbl gets really confused about freeing cpp options
commit b8767451d156f585534afac0bf22721810d0dc63
    13588 want a tools geniconvtbl
commit 63be7eb52ac2a58b3a00a7c7dff8d701df814cc0
    12302 ksh dumps core while parsing functions

Conflicts:
    usr/src/tools/Makefile

18 files changed, 60 insertions, 43 deletions

diff --git a/usr/src/cmd/mdb/common/kmdb/kmdb_kvm.c b/usr/src/cmd/mdb/common/kmdb/kmdb_kvm.c
index 628503d179..9d2d74195f 100644
--- a/usr/src/cmd/mdb/common/kmdb/kmdb_kvm.c
+++ b/usr/src/cmd/mdb/common/kmdb/kmdb_kvm.c
@@ -1946,6 +1946,10 @@ kmt_wapt_info(mdb_tgt_t *t, mdb_sespec_t *sep, mdb_vespec_t *vep,
 		else
 			fmt = "stop on %s of I/O port [%p, %p)";
 		break;
+
+	default:
+		fmt = "stop on %s of unknown [%p, %p]";
+		break;
 	}
 
 	(void) mdb_iob_snprintf(buf, nbytes, fmt, desc + 1, wp->wp_addr,
@@ -2394,18 +2398,18 @@ kmt_destroy(mdb_tgt_t *t)
 
 static const mdb_tgt_ops_t kmt_ops = {
 	kmt_setflags,				/* t_setflags */
-	(int (*)())(uintptr_t) mdb_tgt_notsup,	/* t_setcontext */
+	(int (*)())(uintptr_t)mdb_tgt_notsup,	/* t_setcontext */
 	kmt_activate,				/* t_activate */
-	(void (*)())(uintptr_t) mdb_tgt_nop,	/* t_deactivate */
+	(void (*)())(uintptr_t)mdb_tgt_nop,	/* t_deactivate */
 	kmt_periodic,				/* t_periodic */
 	kmt_destroy,				/* t_destroy */
 	kmt_name,				/* t_name */
-	(const char *(*)()) mdb_conf_isa,	/* t_isa */
+	(const char *(*)())mdb_conf_isa,	/* t_isa */
 	kmt_platform,				/* t_platform */
 	kmt_uname,				/* t_uname */
 	kmt_dmodel,				/* t_dmodel */
-	(ssize_t (*)()) mdb_tgt_notsup,		/* t_aread */
-	(ssize_t (*)()) mdb_tgt_notsup,		/* t_awrite */
+	(ssize_t (*)())mdb_tgt_notsup,		/* t_aread */
+	(ssize_t (*)())mdb_tgt_notsup,		/* t_awrite */
 	kmt_read,				/* t_vread */
 	kmt_write,				/* t_vwrite */
 	kmt_pread,				/* t_pread */
@@ -2425,25 +2429,25 @@ static const mdb_tgt_ops_t kmt_ops = {
 	kmt_addr_to_ctf,			/* t_addr_to_ctf */
 	kmt_name_to_ctf,			/* t_name_to_ctf */
 	kmt_status,				/* t_status */
-	(int (*)())(uintptr_t) mdb_tgt_notsup,	/* t_run */
+	(int (*)())(uintptr_t)mdb_tgt_notsup,	/* t_run */
 	kmt_step,				/* t_step */
 	kmt_step_out,				/* t_step_out */
 	kmt_next,				/* t_next */
 	kmt_continue,				/* t_cont */
-	(int (*)())(uintptr_t) mdb_tgt_notsup,	/* t_signal */
+	(int (*)())(uintptr_t)mdb_tgt_notsup,	/* t_signal */
 	kmt_add_vbrkpt,				/* t_add_vbrkpt */
 	kmt_add_sbrkpt,				/* t_add_sbrkpt */
 	kmt_add_pwapt,				/* t_add_pwapt */
 	kmt_add_vwapt,				/* t_add_vwapt */
 	kmt_add_iowapt,				/* t_add_iowapt */
-	(int (*)())(uintptr_t) mdb_tgt_null,	/* t_add_sysenter */
-	(int (*)())(uintptr_t) mdb_tgt_null,	/* t_add_sysexit */
-	(int (*)())(uintptr_t) mdb_tgt_null,	/* t_add_signal */
+	(int (*)())(uintptr_t)mdb_tgt_null,	/* t_add_sysenter */
+	(int (*)())(uintptr_t)mdb_tgt_null,	/* t_add_sysexit */
+	(int (*)())(uintptr_t)mdb_tgt_null,	/* t_add_signal */
 	kmt_add_trap,				/* t_add_fault */
 	kmt_getareg,				/* t_getareg */
 	kmt_putareg,				/* t_putareg */
-	(int (*)())(uintptr_t) mdb_tgt_nop,	/* XXX t_stack_iter */
-	(int (*)())(uintptr_t) mdb_tgt_notsup	/* t_auxv */
+	(int (*)())(uintptr_t)mdb_tgt_nop,	/* XXX t_stack_iter */
+	(int (*)())(uintptr_t)mdb_tgt_notsup	/* t_auxv */
 };
 
 /*
diff --git a/usr/src/cmd/mdb/common/kmdb/kmdb_module_load.c b/usr/src/cmd/mdb/common/kmdb/kmdb_module_load.c
index 38ba3ffe48..de65c8e43a 100644
--- a/usr/src/cmd/mdb/common/kmdb/kmdb_module_load.c
+++ b/usr/src/cmd/mdb/common/kmdb/kmdb_module_load.c
@@ -24,8 +24,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <sys/param.h>
 #include <sys/modctl.h>
 #include <sys/kobj.h>
@@ -123,7 +121,7 @@ kmdb_module_loaded(kmdb_wr_load_t *dlr)
 	struct modctl *modp = dlr->dlr_modctl;
 	const char *modname = strbasename(dlr->dlr_fname);
 	struct module *mp;
-	kmdb_modctl_t *kmc;
+	kmdb_modctl_t *kmc = NULL;
 	mdb_var_t *v;
 
 	v = mdb_nv_lookup(&mdb.m_dmodctl, modname);
diff --git a/usr/src/cmd/mdb/common/mdb/mdb_cmds.c b/usr/src/cmd/mdb/common/mdb/mdb_cmds.c
index ecdf2957bf..4a71c04dfb 100644
--- a/usr/src/cmd/mdb/common/mdb/mdb_cmds.c
+++ b/usr/src/cmd/mdb/common/mdb/mdb_cmds.c
@@ -321,6 +321,9 @@ write_arglist(mdb_tgt_as_t as, mdb_tgt_addr_t addr,
 	case 'Z':
 		write_value = write_uint64;
 		break;
+	default:
+		write_value = NULL;
+		break;
 	}
 
 	for (argv++, i = 1; i < argc; i++, argv++) {
@@ -435,6 +438,10 @@ match_arglist(mdb_tgt_as_t as, uint_t flags, mdb_tgt_addr_t addr,
 	case 'M':
 		match_value = match_uint64;
 		break;
+	default:
+		mdb_warn("unknown match value %c\n",
+		    argv->a_un.a_char);
+		return (DCMD_ERR);
 	}
 
 	for (argv++, i = 1; i < argc; i++, argv++) {
diff --git a/usr/src/cmd/mdb/common/mdb/mdb_ctf.c b/usr/src/cmd/mdb/common/mdb/mdb_ctf.c
index 9cc7c6f1a0..0368f88ad1 100644
--- a/usr/src/cmd/mdb/common/mdb/mdb_ctf.c
+++ b/usr/src/cmd/mdb/common/mdb/mdb_ctf.c
@@ -240,7 +240,7 @@ name_to_type(mdb_tgt_t *t, const char *cname, ctf_id_t *idp)
 {
 	const char *object = MDB_TGT_OBJ_EXEC;
 	ctf_file_t *fp = NULL;
-	ctf_id_t id;
+	ctf_id_t id = CTF_ERR;
 	tnarg_t arg;
 	char *p, *s;
 	char buf[MDB_SYM_NAMLEN];
diff --git a/usr/src/cmd/mdb/common/mdb/mdb_fmt.c b/usr/src/cmd/mdb/common/mdb/mdb_fmt.c
index 6a745b2ac4..e14a4d0bc2 100644
--- a/usr/src/cmd/mdb/common/mdb/mdb_fmt.c
+++ b/usr/src/cmd/mdb/common/mdb/mdb_fmt.c
@@ -805,6 +805,9 @@ mdb_fmt_print(mdb_tgt_t *t, mdb_tgt_as_t as,
 				}
 				rvalue = u.i8;
 				break;
+			default:
+				rvalue = 0;
+				break;
 			}
 
 			mdb_nv_set_value(mdb.m_rvalue, rvalue);
diff --git a/usr/src/cmd/mdb/common/mdb/mdb_kvm.c b/usr/src/cmd/mdb/common/mdb/mdb_kvm.c
index 27ca238ca9..dc1c248bac 100644
--- a/usr/src/cmd/mdb/common/mdb/mdb_kvm.c
+++ b/usr/src/cmd/mdb/common/mdb/mdb_kvm.c
@@ -563,7 +563,7 @@ kt_activate(mdb_tgt_t *t)
 	kt_data_t *kt = t->t_data;
 	void *sym;
 
-	int oflag;
+	int oflag = 0;
 
 	mdb_prop_postmortem = kt->k_xpv_domu || (kt->k_dumphdr != NULL);
 	mdb_prop_kernel = TRUE;
diff --git a/usr/src/cmd/mdb/common/mdb/mdb_nm.c b/usr/src/cmd/mdb/common/mdb/mdb_nm.c
index 0653075e54..e0c18de0a2 100644
--- a/usr/src/cmd/mdb/common/mdb/mdb_nm.c
+++ b/usr/src/cmd/mdb/common/mdb/mdb_nm.c
@@ -563,7 +563,7 @@ cmd_nm(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 	int hwidth;
 	size_t nsyms = 0;
 
-	nm_sym_t *syms, *symp;
+	nm_sym_t *syms = NULL, *symp;
 
 	nm_iter_info_t nii;
 
diff --git a/usr/src/cmd/mdb/common/mdb/mdb_print.c b/usr/src/cmd/mdb/common/mdb/mdb_print.c
index bd23ef681f..7c213faf24 100644
--- a/usr/src/cmd/mdb/common/mdb/mdb_print.c
+++ b/usr/src/cmd/mdb/common/mdb/mdb_print.c
@@ -533,7 +533,7 @@ cmd_enum(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 	mdb_ctf_id_t idr;
 
 	int i;
-	intmax_t search;
+	intmax_t search = 0;
 	uint_t isp2;
 
 	info.e_flags = (flags & DCMD_PIPE_OUT)? 0 : E_PRETTY;
diff --git a/usr/src/cmd/mdb/common/mdb/mdb_proc.c b/usr/src/cmd/mdb/common/mdb/mdb_proc.c
index 5169cfb6a5..9ffa80916c 100644
--- a/usr/src/cmd/mdb/common/mdb/mdb_proc.c
+++ b/usr/src/cmd/mdb/common/mdb/mdb_proc.c
@@ -5305,7 +5305,7 @@ mdb_proc_tgt_create(mdb_tgt_t *t, int argc, const char *argv[])
 	char execname[MAXPATHLEN];
 	struct stat64 st;
 	int perr;
-	int state;
+	int state = 0;
 	struct rlimit rlim;
 	int i;
 
diff --git a/usr/src/cmd/mdb/common/mdb/mdb_target.c b/usr/src/cmd/mdb/common/mdb/mdb_target.c
index e0ae29bd99..29339f734f 100644
--- a/usr/src/cmd/mdb/common/mdb/mdb_target.c
+++ b/usr/src/cmd/mdb/common/mdb/mdb_target.c
@@ -506,7 +506,7 @@ ssize_t
 mdb_tgt_readstr(mdb_tgt_t *t, mdb_tgt_as_t as, char *buf,
     size_t nbytes, mdb_tgt_addr_t addr)
 {
-	ssize_t n, nread = mdb_tgt_aread(t, as, buf, nbytes, addr);
+	ssize_t n = -1, nread = mdb_tgt_aread(t, as, buf, nbytes, addr);
 	char *p;
 
 	if (nread >= 0) {
diff --git a/usr/src/cmd/mdb/common/modules/genunix/genunix.c b/usr/src/cmd/mdb/common/modules/genunix/genunix.c
index 32370ba7e1..acc239b9a6 100644
--- a/usr/src/cmd/mdb/common/modules/genunix/genunix.c
+++ b/usr/src/cmd/mdb/common/modules/genunix/genunix.c
@@ -2995,7 +2995,7 @@ cpu_walk_init(mdb_walk_state_t *wsp)
 	int max_ncpus, i = 0;
 	uintptr_t current, first;
 	cpu_t cpu, panic_cpu;
-	uintptr_t panicstr, addr;
+	uintptr_t panicstr, addr = 0;
 	GElf_Sym sym;
 
 	cw = mdb_zalloc(sizeof (cpu_walk_t), UM_SLEEP | UM_GC);
@@ -3160,7 +3160,7 @@ cpuinfo_walk_cpu(uintptr_t addr, const cpu_t *cpu, cpuinfo_data_t *cid)
 	kthread_t t;
 	disp_t disp;
 	mdb_cpuinfo_proc_t p;
-	uintptr_t pinned;
+	uintptr_t pinned = 0;
 	char **flagbuf;
 	int nflaglines = 0, flagline = 0, bspl, rval = WALK_NEXT;
 
diff --git a/usr/src/cmd/mdb/common/modules/genunix/kmem.c b/usr/src/cmd/mdb/common/modules/genunix/kmem.c
index 146317e012..87ae1430f9 100644
--- a/usr/src/cmd/mdb/common/modules/genunix/kmem.c
+++ b/usr/src/cmd/mdb/common/modules/genunix/kmem.c
@@ -1155,7 +1155,7 @@ kmem_walk_init_common(mdb_walk_state_t *wsp, int type)
 
 	size_t magmax, magcnt;
 	void **maglist = NULL;
-	uint_t chunksize, slabsize;
+	uint_t chunksize = 1, slabsize = 1;
 	int status = WALK_ERR;
 	uintptr_t addr = wsp->walk_addr;
 	const char *layered;
diff --git a/usr/src/cmd/mdb/common/modules/genunix/lgrp.c b/usr/src/cmd/mdb/common/modules/genunix/lgrp.c
index aa798bdb00..a09978bd04 100644
--- a/usr/src/cmd/mdb/common/modules/genunix/lgrp.c
+++ b/usr/src/cmd/mdb/common/modules/genunix/lgrp.c
@@ -231,9 +231,9 @@ lgrp(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 	int opt_q = 0; /* display only address. */
 	int i;
 	const char *s_index = NULL, *s_handle = NULL, *s_parent = NULL;
-	uintptr_t index;
-	uintptr_t handle;
-	uintptr_t parent;
+	uintptr_t index = 0;
+	uintptr_t handle = 0;
+	uintptr_t parent = 0;
 	int filters = 0;
 
 	if (!(flags & DCMD_ADDRSPEC)) {
@@ -638,7 +638,7 @@ lgrp_set_walk_init(mdb_walk_state_t *wsp, klgrpset_t set)
 	lwsd->lswd_nlgrps = nlgrps;
 
 	if (mdb_readsym(lwsd->lwsd_lgrp_tbl, nlgrps * sizeof (lgrp_t *),
-		"lgrp_table") == -1) {
+	    "lgrp_table") == -1) {
 		mdb_warn("unable to read lgrp_table");
 		return (WALK_ERR);
 	}
diff --git a/usr/src/cmd/mdb/common/modules/genunix/net.c b/usr/src/cmd/mdb/common/modules/genunix/net.c
index f29407b76a..01ca4e68c4 100644
--- a/usr/src/cmd/mdb/common/modules/genunix/net.c
+++ b/usr/src/cmd/mdb/common/modules/genunix/net.c
@@ -384,7 +384,7 @@ sonode(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 	const char *optf = NULL;
 	const char *optt = NULL;
 	const char *optp = NULL;
-	int family, type, proto;
+	int family = AF_UNSPEC, type = 0, proto = 0;
 	int filter = 0;
 	struct sonode so;
 
@@ -1414,7 +1414,6 @@ do_show_bridge(uintptr_t addr, const void *data, void *ptr)
 	trill_nickinfo_t tni;
 	char bname[MAXLINKNAMELEN];
 	char macaddr[ETHERADDRL * 3];
-	char *cp;
 	uint_t nnicks;
 	int i;
 
@@ -1430,9 +1429,9 @@ do_show_bridge(uintptr_t addr, const void *data, void *ptr)
 
 	(void) strncpy(bname, bip->bi_name, sizeof (bname) - 1);
 	bname[MAXLINKNAMELEN - 1] = '\0';
-	cp = bname + strlen(bname);
-	if (cp > bname && cp[-1] == '0')
-		cp[-1] = '\0';
+	i = strlen(bname);
+	if (i > 1 && bname[i - 1] == '0')
+		bname[i - 1] = '\0';
 
 	if (args->name != NULL && strcmp(args->name, bname) != 0)
 		return (WALK_NEXT);
diff --git a/usr/src/cmd/mdb/common/modules/genunix/typegraph.c b/usr/src/cmd/mdb/common/modules/genunix/typegraph.c
index b7f6cf854d..ad68c39279 100644
--- a/usr/src/cmd/mdb/common/modules/genunix/typegraph.c
+++ b/usr/src/cmd/mdb/common/modules/genunix/typegraph.c
@@ -2765,7 +2765,7 @@ int
 typeconflict_walk_step(mdb_walk_state_t *wsp)
 {
 	size_t ndx;
-	tg_node_t *node;
+	tg_node_t *node = NULL;
 
 	for (ndx = (size_t)wsp->walk_data; ndx < tg_nnodes; ndx++) {
 		node = &tg_node[ndx];
@@ -2793,7 +2793,7 @@ int
 typeunknown_walk_step(mdb_walk_state_t *wsp)
 {
 	size_t ndx;
-	tg_node_t *node;
+	tg_node_t *node = NULL;
 
 	for (ndx = (size_t)wsp->walk_data; ndx < tg_nnodes; ndx++) {
 		node = &tg_node[ndx];
diff --git a/usr/src/cmd/mdb/common/modules/ipp/ipp.c b/usr/src/cmd/mdb/common/modules/ipp/ipp.c
index 8af4103c20..e744a3140b 100644
--- a/usr/src/cmd/mdb/common/modules/ipp/ipp.c
+++ b/usr/src/cmd/mdb/common/modules/ipp/ipp.c
@@ -568,7 +568,7 @@ dump_classes(
 	uint_t		nelt)
 {
 	ipp_class_t	*array;
-	ipp_class_t	*cp;
+	ipp_class_t	*cp = NULL;
 	uint_t		i;
 	boolean_t	first_time = B_TRUE;
 	char		buf[MAXNAMELEN];
@@ -601,7 +601,7 @@ dump_log(
 	uint_t		nelt)
 {
 	ipp_log_t	*array;
-	ipp_log_t	*lp;
+	ipp_log_t	*lp = NULL;
 	uint_t		i;
 	boolean_t	first_time = B_TRUE;
 	char		buf[MAXNAMELEN];
diff --git a/usr/src/cmd/mdb/common/modules/libumem/umem.c b/usr/src/cmd/mdb/common/modules/libumem/umem.c
index 018a33dd46..a1b3df481b 100644
--- a/usr/src/cmd/mdb/common/modules/libumem/umem.c
+++ b/usr/src/cmd/mdb/common/modules/libumem/umem.c
@@ -1119,7 +1119,7 @@ umem_walk_init_common(mdb_walk_state_t *wsp, int type)
 
 	size_t magmax, magcnt;
 	void **maglist = NULL;
-	uint_t chunksize, slabsize;
+	uint_t chunksize = 1, slabsize = 1;
 	int status = WALK_ERR;
 	uintptr_t addr = wsp->walk_addr;
 	const char *layered;
diff --git a/usr/src/cmd/mdb/common/modules/pmcs/pmcs.c b/usr/src/cmd/mdb/common/modules/pmcs/pmcs.c
index 4ff1bc068f..b010a02a8e 100644
--- a/usr/src/cmd/mdb/common/modules/pmcs/pmcs.c
+++ b/usr/src/cmd/mdb/common/modules/pmcs/pmcs.c
@@ -771,6 +771,9 @@ display_targets(struct pmcs_hw m, int verbose, int totals_only)
 			dtype = "SMP";
 			smp_targets++;
 			break;
+		default:
+			dtype = "Unknown";
+			break;
 		}
 
 		if (totals_only) {
@@ -1951,7 +1954,7 @@ display_phy(struct pmcs_phy phy, struct pmcs_phy *phyp, int verbose,
 	char		*asent = no;
 	char		*dead = no;
 	char		*changed = no;
-	char		route_attr, route_method;
+	char		route_attr, route_method = '\0';
 
 	switch (phy.dtype) {
 	case NOTHING:
@@ -1975,6 +1978,9 @@ display_phy(struct pmcs_phy phy, struct pmcs_phy *phyp, int verbose,
 			++exp_phys;
 		}
 		break;
+	default:
+		dtype = "Unknown";
+		break;
 	}
 
 	if (phy.dtype == NOTHING) {
@@ -2556,7 +2562,7 @@ display_matching_work(struct pmcs_hw ss, uintmax_t index, uintmax_t snum,
 	uintptr_t	_wp;
 	boolean_t	printed_header = B_FALSE;
 	uint32_t	mask, mask_val, match_val;
-	char		*match_type;
+	char		*match_type = NULL;
 
 	if (index != UINT_MAX) {
 		match_type = "index";
@@ -2627,7 +2633,7 @@ pmcs_tag(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 	uintmax_t		index = UINT_MAX;
 	int			args = 0;
 	void			*pmcs_state;
-	char			*state_str;
+	char			*state_str = NULL;
 	struct dev_info		dip;
 
 	if (!(flags & DCMD_ADDRSPEC)) {
@@ -2928,10 +2934,10 @@ pmcs_dcmd(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 	uint_t			fwlog = FALSE;
 	boolean_t		devid_filter = FALSE;
 	uintptr_t		pdevid;
-	uint32_t		devid;
+	uint32_t		devid = 0;
 	int			rv = DCMD_OK;
 	void			*pmcs_state;
-	char			*state_str;
+	char			*state_str = NULL;
 	struct dev_info		dip;
 	per_iport_setting_t	pis;