diff options
author | NIIBE Yutaka <[email protected]> | 2019-02-26 01:58:16 +0000 |
---|---|---|
committer | Werner Koch <[email protected]> | 2019-03-07 12:02:29 +0000 |
commit | 229302aecf8deea0349e79ca0cc05f32665391b7 (patch) | |
tree | b75e096d2d7e205f980b5bbd6d60905e59aa3a0a /dirmngr/dns.c | |
parent | libdns: Avoid using compound literals (3). (diff) | |
download | gnupg-229302aecf8deea0349e79ca0cc05f32665391b7.tar.gz gnupg-229302aecf8deea0349e79ca0cc05f32665391b7.zip |
libdns: Avoid using compound literals (4).
* dirmngr/dns.h (dns_d_new*): Remove.
* dirmngr/dns.c (parse_packet): Use dns_d_init with automatic
variable.
(parse_domain): Likewise.
Signed-off-by: NIIBE Yutaka <[email protected]>
(cherry picked from commit 7313a112f9c7ada61d24285313d2e2d069a672e8)
Diffstat (limited to 'dirmngr/dns.c')
-rw-r--r-- | dirmngr/dns.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/dirmngr/dns.c b/dirmngr/dns.c index ffb36c98b..eb086fc8e 100644 --- a/dirmngr/dns.c +++ b/dirmngr/dns.c @@ -10632,8 +10632,11 @@ static int parse_packet(int argc DNS_NOTUSED, char *argv[] DNS_NOTUSED) { #if 0 dns_rr_foreach(&rr, Q, .name = "ns8.yahoo.com.") { #else + char _p[DNS_D_MAXNAME + 1] = { 0 }; + const char *dn = "ns8.yahoo.com"; + char *_name = dns_d_init(_p, sizeof _p, dn, strlen (dn), DNS_D_ANCHOR); struct dns_rr rrset[32]; - struct dns_rr_i *rri = dns_rr_i_new(Q, .name = dns_d_new("ns8.yahoo.com", DNS_D_ANCHOR), .sort = MAIN.sort); + struct dns_rr_i *rri = dns_rr_i_new(Q, .name = _name, .sort = MAIN.sort); unsigned rrcount = dns_rr_grep(rrset, lengthof(rrset), rri, Q, &error); for (unsigned i = 0; i < rrcount; i++) { @@ -10661,13 +10664,14 @@ static int parse_packet(int argc DNS_NOTUSED, char *argv[] DNS_NOTUSED) { static int parse_domain(int argc, char *argv[]) { + char _p[DNS_D_MAXNAME + 1] = { 0 }; char *dn; dn = (argc > 1)? argv[1] : "f.l.google.com"; printf("[%s]\n", dn); - dn = dns_d_new(dn); + dn = dns_d_init(_p, sizeof _p, dn, strlen (dn), DNS_D_ANCHOR); do { puts(dn); |