Commit c481327e authored by Mark Andrews's avatar Mark Andrews
Browse files

silence compiler warnings [RT #15562]

parent dcb55103
......@@ -16,7 +16,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
static const char rcsid[] = "$Id: inet_cidr_ntop.c,v 1.5 2005/04/27 04:56:19 sra Exp $";
static const char rcsid[] = "$Id: inet_cidr_ntop.c,v 1.6 2005/11/03 22:59:51 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)
......
......@@ -16,7 +16,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
static const char rcsid[] = "$Id: inet_ntop.c,v 1.4 2005/04/27 04:56:21 sra Exp $";
static const char rcsid[] = "$Id: inet_ntop.c,v 1.5 2005/11/03 22:59:52 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)
......
......@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: check.c,v 1.64 2005/09/12 02:04:41 marka Exp $ */
/* $Id: check.c,v 1.65 2005/11/03 22:59:52 marka Exp $ */
/*! \file */
......@@ -707,8 +707,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");
......
......@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: journal.c,v 1.93 2005/06/08 02:06:58 marka Exp $ */
/* $Id: journal.c,v 1.94 2005/11/03 22:59:52 marka Exp $ */
#include <config.h>
......@@ -1561,7 +1561,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
......
......@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: xfrin.c,v 1.141 2005/10/14 01:14:09 marka Exp $ */
/* $Id: xfrin.c,v 1.142 2005/11/03 22:59:53 marka Exp $ */
/*! \file */
......@@ -583,7 +583,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;
......
......@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: socket.c,v 1.255 2005/10/17 03:47:10 marka Exp $ */
/* $Id: socket.c,v 1.256 2005/11/03 22:59:53 marka Exp $ */
/*! \file */
......@@ -400,6 +400,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;
......
......@@ -19,7 +19,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
static char rcsid[] =
"$Id: lwinetntop.c,v 1.15 2005/04/29 00:24:07 marka Exp $";
"$Id: lwinetntop.c,v 1.16 2005/11/03 22:59:53 marka Exp $";
#endif /* LIBC_SCCS and not lint */
#include <config.h>
......@@ -128,7 +128,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)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment