diff options
| author |   eric <eric@openbsd.org> | 2017-02-23 17:04:02 +0000 |
|---|---|---|
| committer | eric <eric@openbsd.org> | 2017-02-23 17:04:02 +0000 |
| commit | f6f51dad2ad553583ef95d338f9437aa1f620a3e (patch) | |
| tree | d441125eacf9731b21a7d2d09ddbc3f7e4939b08 /lib/libc/asr/getnetnamadr_async.c | |
| parent | Check return value of every BN_* functions in bntest (diff) | |
| download | wireguard-openbsd-f6f51dad2ad553583ef95d338f9437aa1f620a3e.tar.xz wireguard-openbsd-f6f51dad2ad553583ef95d338f9437aa1f620a3e.zip | |
Put a common subq pointer in the query struct, rather than one in each
element of the union.
ok gilles@ millert@ krw@
Diffstat (limited to 'lib/libc/asr/getnetnamadr_async.c')
| -rw-r--r-- | lib/libc/asr/getnetnamadr_async.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/libc/asr/getnetnamadr_async.c b/lib/libc/asr/getnetnamadr_async.c index a1ff84a455e..0b8adc944b9 100644 --- a/lib/libc/asr/getnetnamadr_async.c +++ b/lib/libc/asr/getnetnamadr_async.c @@ -1,4 +1,4 @@ -/* $OpenBSD: getnetnamadr_async.c,v 1.24 2017/02/21 22:32:28 eric Exp $ */ +/* $OpenBSD: getnetnamadr_async.c,v 1.25 2017/02/23 17:04:02 eric Exp $ */ /* * Copyright (c) 2012 Eric Faurot <eric@openbsd.org> * @@ -155,7 +155,7 @@ getnetnamadr_async_run(struct asr_query *as, struct asr_result *ar) */ type = T_PTR; name = as->as.netnamadr.name; - as->as.netnamadr.subq = _res_search_async_ctx( + as->as_subq = _res_search_async_ctx( name, C_IN, type, as->as_ctx); } else { type = T_PTR; @@ -165,11 +165,11 @@ getnetnamadr_async_run(struct asr_query *as, struct asr_result *ar) _asr_addr_as_fqdn((char *)&in, as->as.netnamadr.family, dname, sizeof(dname)); - as->as.netnamadr.subq = _res_query_async_ctx( + as->as_subq = _res_query_async_ctx( name, C_IN, type, as->as_ctx); } - if (as->as.netnamadr.subq == NULL) { + if (as->as_subq == NULL) { ar->ar_errno = errno; ar->ar_h_errno = NETDB_INTERNAL; async_set_state(as, ASR_STATE_HALT); @@ -211,9 +211,9 @@ getnetnamadr_async_run(struct asr_query *as, struct asr_result *ar) case ASR_STATE_SUBQUERY: - if ((r = asr_run(as->as.netnamadr.subq, ar)) == ASYNC_COND) + if ((r = asr_run(as->as_subq, ar)) == ASYNC_COND) return (ASYNC_COND); - as->as.netnamadr.subq = NULL; + as->as_subq = NULL; if (ar->ar_datalen == -1) { async_set_state(as, ASR_STATE_NEXT_DB); |