silence compiler warnings [RT #15562]

diff --git a/lib/bind/inet/inet_cidr_ntop.c b/lib/bind/inet/inet_cidr_ntop.c
index 184ad7c580cb1d50f56f7a508817d80f965beb42..192cf1e752ef33035cbdc10f53eb8d24d880a87e 100644 (file)
--- a/lib/bind/inet/inet_cidr_ntop.c
+++ b/lib/bind/inet/inet_cidr_ntop.c
@@ -16,7 +16,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id: inet_cidr_ntop.c,v 1.1.2.1.8.2 2004/03/17 00:29:46 marka Exp $";
+static const char rcsid[] = "$Id: inet_cidr_ntop.c,v 1.1.2.1.8.3 2005/11/03 23:08:40 marka Exp $";
 #endif
 
 #include "port_before.h"
@@ -178,7 +178,9 @@ inet_cidr_ntop_ipv6(const u_char *src, int bits, char *dst, size_t size) {
        for (i = 0; i < NS_IN6ADDRSZ; i++)
                words[i / 2] |= (src[i] << ((1 - (i % 2)) << 3));
        best.base = -1;
+       best.len = 0;
        cur.base = -1;
+       cur.len = 0;
        for (i = 0; i < (NS_IN6ADDRSZ / NS_INT16SZ); i++) {
                if (words[i] == 0) {
                        if (cur.base == -1)

diff --git a/lib/bind/inet/inet_ntop.c b/lib/bind/inet/inet_ntop.c
index 6141407fe4a0b4bc3b8e82afd14ce3cd5fe955cb..cd502ab75862fdbf7c0ebf777eb7799c9d3fd8cc 100644 (file)
--- a/lib/bind/inet/inet_ntop.c
+++ b/lib/bind/inet/inet_ntop.c
@@ -16,7 +16,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id: inet_ntop.c,v 1.1.2.1.8.1 2004/03/09 08:33:33 marka Exp $";
+static const char rcsid[] = "$Id: inet_ntop.c,v 1.1.2.1.8.2 2005/11/03 23:08:40 marka Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include "port_before.h"
@@ -137,7 +137,9 @@ inet_ntop6(src, dst, size)
        for (i = 0; i < NS_IN6ADDRSZ; i++)
                words[i / 2] |= (src[i] << ((1 - (i % 2)) << 3));
        best.base = -1;
+       best.len = 0;
        cur.base = -1;
+       cur.len = 0;
        for (i = 0; i < (NS_IN6ADDRSZ / NS_INT16SZ); i++) {
                if (words[i] == 0) {
                        if (cur.base == -1)

diff --git a/lib/bind9/check.c b/lib/bind9/check.c
index 880a569197f13b0c775548c3b6f99db38e613c1b..e6e86fd14dfcfdc0da3ad2f8eeccaa84e0c61862 100644 (file)
--- a/lib/bind9/check.c
+++ b/lib/bind9/check.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: check.c,v 1.37.6.31 2005/05/30 01:59:25 marka Exp $ */
+/* $Id: check.c,v 1.37.6.32 2005/11/03 23:08:41 marka Exp $ */
 
 #include <config.h>
 
@@ -598,8 +598,10 @@ validate_masters(cfg_obj_t *obj, cfg_obj_t *config, isc_uint32_t *countp,
 
        REQUIRE(countp != NULL);
        result = isc_symtab_create(mctx, 100, NULL, NULL, ISC_FALSE, &symtab);
-       if (result != ISC_R_SUCCESS)
+       if (result != ISC_R_SUCCESS) {
+               *countp = count;
                return (result);
+       }
 
  newlist:
        list = cfg_tuple_get(obj, "addresses");

diff --git a/lib/dns/journal.c b/lib/dns/journal.c
index dab992c177cec6c745fbb7a96826391dc174901a..536416d931a141a46deda78ba758696fc6b27e38 100644 (file)
--- a/lib/dns/journal.c
+++ b/lib/dns/journal.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: journal.c,v 1.77.2.1.10.12 2005/06/08 02:08:27 marka Exp $ */
+/* $Id: journal.c,v 1.77.2.1.10.13 2005/11/03 23:08:41 marka Exp $ */
 
 #include <config.h>
 
@@ -1565,7 +1565,7 @@ read_one_rr(dns_journal_t *j) {
        /*
         * Read an RR.
         */
-       result = journal_read_rrhdr(j, &rrhdr);
+       CHECK(journal_read_rrhdr(j, &rrhdr));
        /*
         * Perform a sanity check on the journal RR size.
         * The smallest possible RR has a 1-byte owner name

diff --git a/lib/dns/xfrin.c b/lib/dns/xfrin.c
index a6a53bd72af4a719ba0efb0905231a738431861a..8a824a73ef5ec4804fcaaf27e6306443a8ad53a0 100644 (file)
--- a/lib/dns/xfrin.c
+++ b/lib/dns/xfrin.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: xfrin.c,v 1.124.2.4.2.11 2005/10/14 02:13:07 marka Exp $ */
+/* $Id: xfrin.c,v 1.124.2.4.2.12 2005/11/03 23:08:41 marka Exp $ */
 
 #include <config.h>
 
@@ -581,7 +581,7 @@ dns_xfrin_create2(dns_zone_t *zone, dns_rdatatype_t xfrtype,
                  isc_task_t *task, dns_xfrindone_t done, dns_xfrin_ctx_t **xfrp)
 {
        dns_name_t *zonename = dns_zone_getorigin(zone);
-       dns_xfrin_ctx_t *xfr;
+       dns_xfrin_ctx_t *xfr = NULL;
        isc_result_t result;
        dns_db_t *db = NULL;
 

diff --git a/lib/isc/unix/socket.c b/lib/isc/unix/socket.c
index 13bf6fb3bac2032d77b0aaad21cedf52334c6b41..595990f995c5f8af674c6bd0cddc2c39b1a6b6a3 100644 (file)
--- a/lib/isc/unix/socket.c
+++ b/lib/isc/unix/socket.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: socket.c,v 1.207.2.19.2.21 2005/08/25 04:32:55 marka Exp $ */
+/* $Id: socket.c,v 1.207.2.19.2.22 2005/11/03 23:08:42 marka Exp $ */
 
 #include <config.h>
 
@@ -389,6 +389,7 @@ select_readmsg(isc_socketmgr_t *mgr, int *fd, int *msg) {
        cc = read(mgr->pipe_fds[0], buf, sizeof(buf));
        if (cc < 0) {
                *msg = SELECT_POKE_NOTHING;
+               *fd = -1;       /* Silence compiler. */
                if (SOFT_ERROR(errno))
                        return;
 

diff --git a/lib/lwres/lwinetntop.c b/lib/lwres/lwinetntop.c
index f4af00d102e474c0c4e2bb6ba796f0b5f78cf712..c37fc1d997c948eee08ca20012e3ffe87325964a 100644 (file)
--- a/lib/lwres/lwinetntop.c
+++ b/lib/lwres/lwinetntop.c
@@ -17,7 +17,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static char rcsid[] =
-       "$Id: lwinetntop.c,v 1.9.12.3 2004/08/28 06:25:24 marka Exp $";
+       "$Id: lwinetntop.c,v 1.9.12.4 2005/11/03 23:08:42 marka Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <config.h>
@@ -126,7 +126,9 @@ inet_ntop6(const unsigned char *src, char *dst, size_t size) {
        for (i = 0; i < NS_IN6ADDRSZ; i++)
                words[i / 2] |= (src[i] << ((1 - (i % 2)) << 3));
        best.base = -1;
+       best.len = 0;
        cur.base = -1;
+       cur.len = 0;
        for (i = 0; i < (NS_IN6ADDRSZ / NS_INT16SZ); i++) {
                if (words[i] == 0) {
                        if (cur.base == -1)