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/gp2/gp2.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'usr/src/lib/efcode/gp2/gp2.c') diff --git a/usr/src/lib/efcode/gp2/gp2.c b/usr/src/lib/efcode/gp2/gp2.c index 8832230f76..bdc8f2d72f 100644 --- a/usr/src/lib/efcode/gp2/gp2.c +++ b/usr/src/lib/efcode/gp2/gp2.c @@ -24,8 +24,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include #include #include @@ -40,7 +38,7 @@ mem_map_in(fcode_env_t *env, fstack_t hi, fstack_t lo, fstack_t len) { private_data_t *pdp = DEVICE_PRIVATE(env); fc_cell_t virt; - fstack_t mcookie = NULL; + fstack_t mcookie = 0; char *service = "map-in"; int error; int offset = 0; @@ -60,9 +58,9 @@ mem_map_in(fcode_env_t *env, fstack_t hi, fstack_t lo, fstack_t len) if (error) throw_from_fclib(env, 1, "gp2:%s: failed\n", service); - mcookie = mapping_to_mcookie(virt, len, NULL, NULL); + mcookie = mapping_to_mcookie(virt, len, 0, 0); - if (mcookie == NULL) + if (mcookie == 0) throw_from_fclib(env, 1, "gp2:%s: mapping_to_mcookie failed\n", service); @@ -294,7 +292,7 @@ do_device_id(fcode_env_t *env) /* Try to read the wci_id register */ rc = fc_run_priv(pdp->common, "rx@", 1, 1, virtaddr + 0xe0, - &wci_id_reg); + &wci_id_reg); mem_map_out(env, addr, 0x100); -- cgit v1.2.3