summaryrefslogtreecommitdiff
path: root/usr/src
diff options
context:
space:
mode:
authorToomas Soome <tsoome@me.com>2020-12-18 05:34:43 +0200
committerToomas Soome <tsoome@me.com>2020-12-20 20:28:16 +0200
commita92282e44f968185a6bba094d1e5fece2da819cf (patch)
tree786ff8aa91303c28855b20a5dfc154d2e2b699f4 /usr/src
parent8b1df8bf71b7b62e7e4d46fe6b457d4d6447b2b8 (diff)
downloadillumos-joyent-a92282e44f968185a6bba094d1e5fece2da819cf.tar.gz
13376 fm: variable may be used uninitialized
Reviewed by: Robert Mustacchi <rm@fingolfin.org> Reviewed by: C Fraire <cfraire@me.com> Approved by: Dan McDonald <danmcd@joyent.com>
Diffstat (limited to 'usr/src')
-rw-r--r--usr/src/lib/fm/topo/modules/common/nic/topo_nic.c2
-rw-r--r--usr/src/lib/fm/topo/modules/sun4v/platform-mem/mem_mdesc.c13
-rw-r--r--usr/src/lib/fm/topo/modules/sun4v/sun4vpi/pi_subr.c3
3 files changed, 11 insertions, 7 deletions
diff --git a/usr/src/lib/fm/topo/modules/common/nic/topo_nic.c b/usr/src/lib/fm/topo/modules/common/nic/topo_nic.c
index cd272a0c73..8478bd72db 100644
--- a/usr/src/lib/fm/topo/modules/common/nic/topo_nic.c
+++ b/usr/src/lib/fm/topo/modules/common/nic/topo_nic.c
@@ -251,6 +251,8 @@ nic_create_transceiver(topo_mod_t *mod, tnode_t *pnode, dladm_handle_t handle,
case NIC_PORT_SFF:
ret = port_create_sff(mod, pnode, tranid, &port);
break;
+ default:
+ return (-1);
}
if ((ret = nic_port_datalink_props(mod, port, handle, linkid)) != 0)
diff --git a/usr/src/lib/fm/topo/modules/sun4v/platform-mem/mem_mdesc.c b/usr/src/lib/fm/topo/modules/sun4v/platform-mem/mem_mdesc.c
index 37faa04d1e..00ae460ccf 100644
--- a/usr/src/lib/fm/topo/modules/sun4v/platform-mem/mem_mdesc.c
+++ b/usr/src/lib/fm/topo/modules/sun4v/platform-mem/mem_mdesc.c
@@ -200,13 +200,14 @@ mem_get_dimm_by_sn(char *sn, md_mem_info_t *mem)
mem_grp_t *
find_grp(mde_cookie_t *listp, size_t n, mde_cookie_t *bclist,
- mem_bank_map_t **banklist, size_t mem_bank_count, md_mem_info_t *mem) {
-
+ mem_bank_map_t **banklist, size_t mem_bank_count, md_mem_info_t *mem)
+{
mem_grp_t *mg;
mem_bank_map_t *bp;
size_t i, j;
int err;
+ err = 0;
for (mg = mem->mem_group; mg != NULL; mg = mg->mg_next) {
if (mg->mg_size == n) {
err = 0;
@@ -220,9 +221,9 @@ find_grp(mde_cookie_t *listp, size_t n, mde_cookie_t *bclist,
}
if (bp == NULL) err++;
}
- }
- else
+ } else {
err++;
+ }
if (err == 0)
return (mg);
}
@@ -231,8 +232,8 @@ find_grp(mde_cookie_t *listp, size_t n, mde_cookie_t *bclist,
mem_grp_t *
create_grp(topo_mod_t *mod, mde_cookie_t *listp, size_t n, mde_cookie_t *bclist,
- mem_bank_map_t **banklist, size_t mem_bank_count, md_mem_info_t *mem) {
-
+ mem_bank_map_t **banklist, size_t mem_bank_count, md_mem_info_t *mem)
+{
mem_grp_t *mg;
size_t i, j;
diff --git a/usr/src/lib/fm/topo/modules/sun4v/sun4vpi/pi_subr.c b/usr/src/lib/fm/topo/modules/sun4v/sun4vpi/pi_subr.c
index b31eb28683..60ceb89b21 100644
--- a/usr/src/lib/fm/topo/modules/sun4v/sun4vpi/pi_subr.c
+++ b/usr/src/lib/fm/topo/modules/sun4v/sun4vpi/pi_subr.c
@@ -355,6 +355,7 @@ pi_get_chassisid(topo_mod_t *mod, md_t *mdp, mde_cookie_t mde_node)
num_nodes, MD_STR_COMPONENT);
idx = 0;
+ result = 0;
while (id == NULL && idx < num_nodes) {
hc_name = pi_get_topo_hc_name(mod, mdp, chassis_nodes[idx]);
if (hc_name != NULL && strcmp(hc_name, MD_STR_CHASSIS) == 0) {
@@ -976,7 +977,7 @@ int
pi_set_auth(topo_mod_t *mod, md_t *mdp, mde_cookie_t mde_node,
tnode_t *t_parent, tnode_t *t_node)
{
- int result;
+ int result;
int err;
nvlist_t *auth;
char *val = NULL;