diff options
author | Tomek Mrugalski <tomek@isc.org> | 2012-03-09 11:18:14 +0000 |
---|---|---|
committer | Tomek Mrugalski <tomek@isc.org> | 2012-03-09 11:18:14 +0000 |
commit | dd9237c309ac816268ec395f0d65a18a38a9aa2a (patch) | |
tree | f79ad87307715109fdf0886a70b2c4c5c50a7983 /omapip | |
parent | 9a266235e6813d2565dc48949b222ba8e08078cb (diff) | |
download | isc-dhcp-dd9237c309ac816268ec395f0d65a18a38a9aa2a.tar.gz |
Fixed many compilation problems ("set, but not used" warnings) for
gcc 4.6 that may affect Ubuntu 11.10 users. [ISC-Bugs #27588]
Diffstat (limited to 'omapip')
-rw-r--r-- | omapip/handle.c | 4 | ||||
-rw-r--r-- | omapip/listener.c | 9 |
2 files changed, 8 insertions, 5 deletions
diff --git a/omapip/handle.c b/omapip/handle.c index b69ef126..8405acfd 100644 --- a/omapip/handle.c +++ b/omapip/handle.c @@ -3,7 +3,7 @@ Functions for maintaining handles on objects. */ /* - * Copyright (c) 2009-2010 by Internet Systems Consortium, Inc. ("ISC") + * Copyright (c) 2009-2010,2012 by Internet Systems Consortium, Inc. ("ISC") * Copyright (c) 2004-2007 by Internet Systems Consortium, Inc. ("ISC") * Copyright (c) 1999-2003 by Internet Software Consortium * @@ -252,7 +252,6 @@ static isc_result_t omapi_handle_lookup_in (omapi_object_t **o, omapi_handle_table_t *table, int op) { - omapi_handle_table_t *inner; omapi_handle_t scale, index; if (!table || table->first > h || table->limit <= h) @@ -282,7 +281,6 @@ static isc_result_t omapi_handle_lookup_in (omapi_object_t **o, handle must be the subtable of this table whose index into this table's array of children is the handle divided by the scale. */ index = (h - table->first) / scale; - inner = table->children[index].table; return(omapi_handle_lookup_in(o, h, table->children[index].table, op)); } diff --git a/omapip/listener.c b/omapip/listener.c index 0c4dcb13..30259eb6 100644 --- a/omapip/listener.c +++ b/omapip/listener.c @@ -3,6 +3,7 @@ Subroutines that support the generic listener object. */ /* + * Copyright (c) 2012 by Internet Systems Consortium, Inc. ("ISC") * Copyright (c) 2004,2007,2009 by Internet Systems Consortium, Inc. ("ISC") * Copyright (c) 1999-2003 by Internet Software Consortium * @@ -124,7 +125,7 @@ isc_result_t omapi_listen_addr (omapi_object_t *h, status = ISC_R_UNEXPECTED; goto error_exit; } - + #if defined (HAVE_SETFD) if (fcntl (obj -> socket, F_SETFD, 1) < 0) { status = ISC_R_UNEXPECTED; @@ -140,7 +141,7 @@ isc_result_t omapi_listen_addr (omapi_object_t *h, status = ISC_R_UNEXPECTED; goto error_exit; } - + /* Try to bind to the wildcard address using the port number we were given. */ i = bind (obj -> socket, @@ -369,6 +370,10 @@ static void trace_listener_accept_input (trace_type_t *ttype, obj = (omapi_connection_object_t *)0; status = omapi_listener_connect (&obj, lp, 0, &remote_addr); + if (status != ISC_R_SUCCESS) { + log_error("%s:%d: OMAPI: Failed to connect " + "a listener.", MDL); + } omapi_listener_dereference (&lp, MDL); return; } |