]> git.ipfire.org Git - thirdparty/bind9.git/commitdiff
silence compiler warning
authorMark Andrews <marka@isc.org>
Wed, 15 Jan 2014 01:40:09 +0000 (12:40 +1100)
committerMark Andrews <marka@isc.org>
Wed, 15 Jan 2014 01:41:32 +0000 (12:41 +1100)
(cherry picked from commit d8b83f0e2b6e1f20dfc7f1397da01a988448be52)

lib/dns/rdata/generic/rrsig_46.c

index be55045b8d4df128dd59b42d7c7e0398f0d7d23a..9b9ee802a9c5a985073970a5d9bcceaf2ac360c9 100644 (file)
@@ -93,14 +93,15 @@ fromtext_rrsig(ARGS_FROMTEXT) {
        if (strlen(DNS_AS_STR(token)) <= 10U &&
            *DNS_AS_STR(token) != '-' && *DNS_AS_STR(token) != '+') {
                char *end;
-               unsigned long l;
+               unsigned long u;
+               isc_uint64_t u64;
 
-               l = strtoul(DNS_AS_STR(token), &end, 10);
-               if (l == ULONG_MAX || *end != 0)
+               u64 = u = strtoul(DNS_AS_STR(token), &end, 10);
+               if (u == ULONG_MAX || *end != 0)
                        RETTOK(DNS_R_SYNTAX);
-               if ((isc_uint64_t)l > (isc_uint64_t)0xffffffff)
+               if (u64 > 0xffffffffUL)
                        RETTOK(ISC_R_RANGE);
-               time_expire = l;
+               time_expire = u;
        } else
                RETTOK(dns_time32_fromtext(DNS_AS_STR(token), &time_expire));
        RETERR(uint32_tobuffer(time_expire, target));
@@ -113,14 +114,15 @@ fromtext_rrsig(ARGS_FROMTEXT) {
        if (strlen(DNS_AS_STR(token)) <= 10U &&
            *DNS_AS_STR(token) != '-' && *DNS_AS_STR(token) != '+') {
                char *end;
-               unsigned long l;
-
-               l = strtoul(DNS_AS_STR(token), &end, 10);
-               if (l == ULONG_MAX || *end != 0)
+               unsigned long u;
+               isc_uint64_t u64;
+               
+               u64 = u = strtoul(DNS_AS_STR(token), &end, 10);
+               if (u == ULONG_MAX || *end != 0)
                        RETTOK(DNS_R_SYNTAX);
-               if ((isc_uint64_t)l > (isc_uint64_t)0xffffffff)
+               if (u64 > 0xffffffffUL)
                        RETTOK(ISC_R_RANGE);
-               time_signed = l;
+               time_signed = u;
        } else
                RETTOK(dns_time32_fromtext(DNS_AS_STR(token), &time_signed));
        RETERR(uint32_tobuffer(time_signed, target));