]> git.ipfire.org Git - thirdparty/bind9.git/commitdiff
explictly cast to isc_stdtime_t
authorMark Andrews <marka@isc.org>
Mon, 20 Feb 2017 05:57:09 +0000 (16:57 +1100)
committerMark Andrews <marka@isc.org>
Mon, 20 Feb 2017 05:57:41 +0000 (16:57 +1100)
(cherry picked from commit 9998a15284db9b1f289356d956d247e0359dc084)

lib/dns/rbtdb.c

index 66a0c8a66120f38019d99088b96da23d4423eb62..6b0c5a3f9f422ccea9797e2bf4396a2b0ee52a40 100644 (file)
@@ -6762,8 +6762,8 @@ addrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version,
 
                if ((rdataset->attributes & DNS_RDATASETATTR_RESIGN) != 0) {
                        newheader->attributes |= RDATASET_ATTR_RESIGN;
-                       newheader->resign =
-                                   dns_time64_from32(rdataset->resign) >> 1;
+                       newheader->resign = (isc_stdtime_t)
+                               (dns_time64_from32(rdataset->resign) >> 1);
                        newheader->resign_lsb = rdataset->resign & 0x1;
                } else {
                        newheader->resign = 0;
@@ -6948,7 +6948,8 @@ subtractrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version,
        newheader->node = rbtnode;
        if ((rdataset->attributes & DNS_RDATASETATTR_RESIGN) != 0) {
                newheader->attributes |= RDATASET_ATTR_RESIGN;
-               newheader->resign = dns_time64_from32(rdataset->resign) >> 1;
+               newheader->resign = (isc_stdtime_t)
+                       (dns_time64_from32(rdataset->resign) >> 1);
                newheader->resign_lsb = rdataset->resign & 0x1;
        } else {
                newheader->resign = 0;
@@ -7336,7 +7337,8 @@ loading_addrdataset(void *arg, dns_name_t *name, dns_rdataset_t *rdataset) {
        newheader->node = node;
        if ((rdataset->attributes & DNS_RDATASETATTR_RESIGN) != 0) {
                newheader->attributes |= RDATASET_ATTR_RESIGN;
-               newheader->resign = dns_time64_from32(rdataset->resign) >> 1;
+               newheader->resign = (isc_stdtime_t)
+                       (dns_time64_from32(rdataset->resign) >> 1);
                newheader->resign_lsb = rdataset->resign & 0x1;
        } else {
                newheader->resign = 0;
@@ -7642,7 +7644,7 @@ setsigningtime(dns_db_t *db, dns_rdataset_t *rdataset, isc_stdtime_t resign) {
                  isc_rwlocktype_write);
 
        oldresign = header->resign;
-       header->resign = dns_time64_from32(resign) >> 1;
+       header->resign = (isc_stdtime_t)(dns_time64_from32(resign) >> 1);
        header->resign_lsb = resign & 0x1;
        if (header->heap_index != 0) {
                INSIST(RESIGN(header));