From 53f70575bd76aab18905efa48e4023144a97a191 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Fri, 6 Dec 2013 17:38:25 +1100 Subject: [PATCH] silence compiler warnings --- bin/dnssec/dnssec-signzone.c | 4 ++-- bin/tests/dst/t_dst.c | 2 +- lib/dns/journal.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bin/dnssec/dnssec-signzone.c b/bin/dnssec/dnssec-signzone.c index 70406507ea..d0e5fb5499 100644 --- a/bin/dnssec/dnssec-signzone.c +++ b/bin/dnssec/dnssec-signzone.c @@ -803,8 +803,8 @@ hashlist_findnext(const hashlist_t *l, next = l->hashbuf; if (next[l->length - 1] == 0) break; - } while (entries-- > 1); - INSIST(entries != 0); + } while (entries-- > 1U); + INSIST(entries != 0U); return (next); } diff --git a/bin/tests/dst/t_dst.c b/bin/tests/dst/t_dst.c index 1e8be9fa09..95322885f0 100644 --- a/bin/tests/dst/t_dst.c +++ b/bin/tests/dst/t_dst.c @@ -847,7 +847,7 @@ t2_sigchk(char *datapath, char *sigpath, char *keyname, * Read precomputed signature from file in a form usable by dst_verify. */ rval = sig_fromfile(sigpath, &sigbuf); - if (rval != 0) { + if (rval != 0U) { t_info("sig_fromfile failed\n"); (void) free(data); dst_key_free(&key); diff --git a/lib/dns/journal.c b/lib/dns/journal.c index 712e32bfc3..f2c24d7537 100644 --- a/lib/dns/journal.c +++ b/lib/dns/journal.c @@ -705,7 +705,7 @@ dns_journal_open(isc_mem_t *mctx, const char *filename, unsigned int mode, result = journal_open(mctx, filename, write, create, journalp); if (result == ISC_R_NOTFOUND) { namelen = strlen(filename); - if (namelen > 4 && strcmp(filename + namelen - 4, ".jnl") == 0) + if (namelen > 4U && strcmp(filename + namelen - 4, ".jnl") == 0) namelen -= 4; result = isc_string_printf(backup, sizeof(backup), "%.*s.jbk", @@ -2100,7 +2100,7 @@ dns_journal_compact(isc_mem_t *mctx, char *filename, isc_uint32_t serial, isc_boolean_t is_backup = ISC_FALSE; namelen = strlen(filename); - if (namelen > 4 && strcmp(filename + namelen - 4, ".jnl") == 0) + if (namelen > 4U && strcmp(filename + namelen - 4, ".jnl") == 0) namelen -= 4; result = isc_string_printf(newname, sizeof(newname), "%.*s.jnw",