From f6f51dad2ad553583ef95d338f9437aa1f620a3e Mon Sep 17 00:00:00 2001 From: eric Date: Thu, 23 Feb 2017 17:04:02 +0000 Subject: Put a common subq pointer in the query struct, rather than one in each element of the union. ok gilles@ millert@ krw@ --- lib/libc/asr/getnameinfo_async.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'lib/libc/asr/getnameinfo_async.c') diff --git a/lib/libc/asr/getnameinfo_async.c b/lib/libc/asr/getnameinfo_async.c index 714e6b9696c..93d9a2dbea9 100644 --- a/lib/libc/asr/getnameinfo_async.c +++ b/lib/libc/asr/getnameinfo_async.c @@ -1,4 +1,4 @@ -/* $OpenBSD: getnameinfo_async.c,v 1.12 2015/09/20 14:19:21 eric Exp $ */ +/* $OpenBSD: getnameinfo_async.c,v 1.13 2017/02/23 17:04:02 eric Exp $ */ /* * Copyright (c) 2012 Eric Faurot * @@ -140,10 +140,10 @@ getnameinfo_async_run(struct asr_query *as, struct asr_result *ar) /* * Create a subquery to lookup the address. */ - as->as.ni.subq = _gethostbyaddr_async_ctx(addr, addrlen, + as->as_subq = _gethostbyaddr_async_ctx(addr, addrlen, as->as.ni.sa.sa.sa_family, as->as_ctx); - if (as->as.ni.subq == NULL) { + if (as->as_subq == NULL) { ar->ar_gai_errno = EAI_MEMORY; async_set_state(as, ASR_STATE_HALT); break; @@ -154,13 +154,13 @@ getnameinfo_async_run(struct asr_query *as, struct asr_result *ar) case ASR_STATE_SUBQUERY: - if ((r = asr_run(as->as.ni.subq, ar)) == ASYNC_COND) + if ((r = asr_run(as->as_subq, ar)) == ASYNC_COND) return (ASYNC_COND); /* * Request done. */ - as->as.ni.subq = NULL; + as->as_subq = NULL; if (ar->ar_hostent == NULL) { if (as->as.ni.flags & NI_NAMEREQD) { -- cgit v1.2.3-59-g8ed1b