more DNS_NAME_INITABSOLUTE cases

(cherry picked from commit e2f9dcfd86b3a6f42915c26e83f42243097adc6e)

diff --git a/bin/dig/dig.c b/bin/dig/dig.c
index cc2ae460aab21b9a6ff8caff979ba18740e16f2d..2e1ade8bf3d76ad05d5e13ac12d0110625949176 100644 (file)
--- a/bin/dig/dig.c
+++ b/bin/dig/dig.c
@@ -486,14 +486,8 @@ isdotlocal(dns_message_t *msg) {
        isc_result_t result;
        static unsigned char local_ndata[] = { "\005local\0" };
        static unsigned char local_offsets[] = { 0, 6 };
-       static dns_name_t local = {
-               DNS_NAME_MAGIC,
-               local_ndata, 7, 2,
-               DNS_NAMEATTR_READONLY | DNS_NAMEATTR_ABSOLUTE,
-               local_offsets, NULL,
-               {(void *)-1, (void *)-1},
-               {NULL, NULL}
-       };
+       static dns_name_t local =
+               DNS_NAME_INITABSOLUTE(local_ndata, local_offsets);
 
        for (result = dns_message_firstname(msg, DNS_SECTION_QUESTION);
             result == ISC_R_SUCCESS;

diff --git a/lib/dns/rdata/generic/ptr_12.c b/lib/dns/rdata/generic/ptr_12.c
index 652e3dfae2abae2e65e830602ad39b84e63bfbbf..7e56f29e24123efab5637d2aba6b1f4a358b4a96 100644 (file)
--- a/lib/dns/rdata/generic/ptr_12.c
+++ b/lib/dns/rdata/generic/ptr_12.c
@@ -222,38 +222,17 @@ checkowner_ptr(ARGS_CHECKOWNER) {
 static unsigned char ip6_arpa_data[]  = "\003IP6\004ARPA";
 static unsigned char ip6_arpa_offsets[] = { 0, 4, 9 };
 static const dns_name_t ip6_arpa =
-{
-       DNS_NAME_MAGIC,
-       ip6_arpa_data, 10, 3,
-       DNS_NAMEATTR_READONLY | DNS_NAMEATTR_ABSOLUTE,
-       ip6_arpa_offsets, NULL,
-       {(void *)-1, (void *)-1},
-       {NULL, NULL}
-};
+       DNS_NAME_INITABSOLUTE(ip6_arpa_data, ip6_arpa_offsets);
 
 static unsigned char ip6_int_data[]  = "\003IP6\003INT";
 static unsigned char ip6_int_offsets[] = { 0, 4, 8 };
 static const dns_name_t ip6_int =
-{
-       DNS_NAME_MAGIC,
-       ip6_int_data, 9, 3,
-       DNS_NAMEATTR_READONLY | DNS_NAMEATTR_ABSOLUTE,
-       ip6_int_offsets, NULL,
-       {(void *)-1, (void *)-1},
-       {NULL, NULL}
-};
+       DNS_NAME_INITABSOLUTE(ip6_int_data, ip6_int_offsets);
 
 static unsigned char in_addr_arpa_data[]  = "\007IN-ADDR\004ARPA";
 static unsigned char in_addr_arpa_offsets[] = { 0, 8, 13 };
 static const dns_name_t in_addr_arpa =
-{
-       DNS_NAME_MAGIC,
-       in_addr_arpa_data, 14, 3,
-       DNS_NAMEATTR_READONLY | DNS_NAMEATTR_ABSOLUTE,
-       in_addr_arpa_offsets, NULL,
-       {(void *)-1, (void *)-1},
-       {NULL, NULL}
-};
+       DNS_NAME_INITABSOLUTE(in_addr_arpa_data, in_addr_arpa_offsets);
 
 static inline isc_boolean_t
 checknames_ptr(ARGS_CHECKNAMES) {