summaryrefslogtreecommitdiff
path: root/server
diff options
context:
space:
mode:
authorMark Andrews <marka@isc.org>2013-05-23 14:21:20 +1000
committerMark Andrews <marka@isc.org>2013-05-23 14:22:11 +1000
commit4b316d498018f6110f80c4e4461dc71ca1108c33 (patch)
tree15534989b13e54ed253ed60653a796f9d4fb48a0 /server
parenta1e94f489559b461f9dd3462f5fe1b7f03b31ecf (diff)
downloadisc-dhcp-4b316d498018f6110f80c4e4461dc71ca1108c33.tar.gz
- Address static analysis warnings.
[ISC-Bugs #33510] [ISC-Bugs #33511]
Diffstat (limited to 'server')
-rw-r--r--server/omapi.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/server/omapi.c b/server/omapi.c
index 544d42df..5c9f2095 100644
--- a/server/omapi.c
+++ b/server/omapi.c
@@ -3,7 +3,7 @@
OMAPI object interfaces for the DHCP server. */
/*
- * Copyright (c) 2004-2010,2012 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2010,2012,2013 by Internet Systems Consortium, Inc. ("ISC")
* Copyright (c) 1999-2003 by Internet Software Consortium
*
* Permission to use, copy, modify, and distribute this software for any
@@ -2418,7 +2418,6 @@ isc_result_t binding_scope_set_value (struct binding_scope *scope, int createp,
}
memset (bp, 0, sizeof *bp);
bp -> name = nname;
- nname = (char *)0;
bp -> next = scope -> bindings;
scope -> bindings = bp;
} else {
@@ -2534,6 +2533,8 @@ isc_result_t binding_scope_stuff_values (omapi_object_t *c,
status = (omapi_connection_put_uint32
(c,
((u_int32_t)(bp -> value -> value.boolean))));
+ if (status != ISC_R_SUCCESS)
+ return status;
break;
case binding_data:
@@ -2558,6 +2559,8 @@ isc_result_t binding_scope_stuff_values (omapi_object_t *c,
status = (omapi_connection_put_uint32
(c, ((u_int32_t)
(bp -> value -> value.intval))));
+ if (status != ISC_R_SUCCESS)
+ return status;
break;