Mercurial > illumos > git > illumos-joyent
changeset 25616:8fc178e155c7
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>
| author | Toomas Soome <tsoome@me.com> |
|---|---|
| date | Fri, 18 Dec 2020 05:34:43 +0200 |
| parents | 9fc483dacaa9 |
| children | 6f836ae592a5 |
| files | usr/src/lib/fm/topo/modules/common/nic/topo_nic.c usr/src/lib/fm/topo/modules/sun4v/platform-mem/mem_mdesc.c usr/src/lib/fm/topo/modules/sun4v/sun4vpi/pi_subr.c |
| diffstat | 3 files changed, 11 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/usr/src/lib/fm/topo/modules/common/nic/topo_nic.c Tue Dec 15 15:20:42 2020 +0000 +++ b/usr/src/lib/fm/topo/modules/common/nic/topo_nic.c Fri Dec 18 05:34:43 2020 +0200 @@ -251,6 +251,8 @@ 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)
--- a/usr/src/lib/fm/topo/modules/sun4v/platform-mem/mem_mdesc.c Tue Dec 15 15:20:42 2020 +0000 +++ b/usr/src/lib/fm/topo/modules/sun4v/platform-mem/mem_mdesc.c Fri Dec 18 05:34:43 2020 +0200 @@ -200,13 +200,14 @@ 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 @@ } if (bp == NULL) err++; } + } else { + err++; } - else - err++; if (err == 0) return (mg); } @@ -231,8 +232,8 @@ 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;
--- a/usr/src/lib/fm/topo/modules/sun4v/sun4vpi/pi_subr.c Tue Dec 15 15:20:42 2020 +0000 +++ b/usr/src/lib/fm/topo/modules/sun4v/sun4vpi/pi_subr.c Fri Dec 18 05:34:43 2020 +0200 @@ -355,6 +355,7 @@ 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 @@ 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;