From 28e0ac9c914344194ef919b0271895d33f83d396 Mon Sep 17 00:00:00 2001 From: Toomas Soome Date: Wed, 29 Jan 2020 22:17:16 +0200 Subject: 12433 efcode: NULL pointer errors Reviewed by: Gergő Doma Approved by: Dan McDonald MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- usr/src/lib/efcode/fcdriver/build_tree.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'usr/src/lib/efcode/fcdriver/build_tree.c') diff --git a/usr/src/lib/efcode/fcdriver/build_tree.c b/usr/src/lib/efcode/fcdriver/build_tree.c index 9abcbe9fbc..6882b7ba0a 100644 --- a/usr/src/lib/efcode/fcdriver/build_tree.c +++ b/usr/src/lib/efcode/fcdriver/build_tree.c @@ -24,8 +24,6 @@ * All rights reserved. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include #include #include @@ -47,7 +45,7 @@ fc_nodeop(common_data_t *cdp, fc_phandle_t node, char *svc) error = fc_run_priv(cdp, svc, 1, 1, fc_phandle2cell(node), &hcell); if (error) - return (NULL); + return (0); return (fc_cell2phandle(hcell)); } @@ -85,7 +83,7 @@ get_prom_nodeid(fcode_env_t *env, device_t *d) name = get_package_name(env, d); debug_msg(DEBUG_UPLOAD, "Node %s: %p (%p)\n", name, d, pd); if (d->parent) { - private_data_t *ppd = (private_data_t *) d->parent->private; + private_data_t *ppd = (private_data_t *)d->parent->private; fc_phandle_t thisnode; if (os_get_prop_common(cdp, ppd->node, "name", @@ -94,7 +92,7 @@ get_prom_nodeid(fcode_env_t *env, device_t *d) debug_msg(DEBUG_UPLOAD, "Parent: %p (%p) %s = %p\n", d->parent, ppd, namebuf, ppd->node); for (thisnode = fc_nodeop(cdp, ppd->node, FC_CHILD_FCODE); - thisnode != NULL; + thisnode != 0; thisnode = fc_nodeop(cdp, thisnode, FC_PEER_FCODE)) { int status; -- cgit v1.2.3