More places where we can use DNS_NAME_INIT*() macros --- lib/dns/name.c | 28 +++------------------------- 1 file changed, 3 insertions(+), 25 deletions(-) diff --git a/lib/dns/name.c b/lib/dns/name.c index d99d360..07ad6dc 100644 --- a/lib/dns/name.c +++ b/lib/dns/name.c @@ -146,34 +146,12 @@ do { \ */ static unsigned char root_ndata[] = { '\0' }; static unsigned char root_offsets[] = { 0 }; - -static dns_name_t root = -{ - DNS_NAME_MAGIC, - root_ndata, 1, 1, - DNS_NAMEATTR_READONLY | DNS_NAMEATTR_ABSOLUTE, - root_offsets, NULL, - {(void *)-1, (void *)-1}, - {NULL, NULL} -}; - -/* XXXDCL make const? */ +static dns_name_t root = DNS_NAME_INITABSOLUTE(root_ndata, root_offsets); LIBDNS_EXTERNAL_DATA const dns_name_t *dns_rootname = &root; -static unsigned char wild_ndata[] = { '\001', '*' }; +static unsigned char wild_ndata[] = "\001*"; static unsigned char wild_offsets[] = { 0 }; - -static dns_name_t wild = -{ - DNS_NAME_MAGIC, - wild_ndata, 2, 1, - DNS_NAMEATTR_READONLY, - wild_offsets, NULL, - {(void *)-1, (void *)-1}, - {NULL, NULL} -}; - -/* XXXDCL make const? */ +static dns_name_t wild =DNS_NAME_INITNONABSOLUTE(wild_ndata, wild_offsets); LIBDNS_EXTERNAL_DATA const dns_name_t *dns_wildcardname = &wild; unsigned int -- 2.10.1.445.g3cdd5d1