Since resolve() switched to a callback mechanism all uw_resolver objects

    pass through resolve() and either asr_resolve_done() or
    ub_resolve_done().
    With that we can pull resolver_ref() and resolver_unref() into those
    functions to make the reference counting easier.
    Only check_resolver is special since it needs to refcount the to be
    checked resolver. But the resolver doing the actual work is
    automatically refcounted by resolve() and *_resolve_done().
    One last piece of the puzzle is to track the uw_resolver object in
    cb_data so that the *_resolve_done() functions have access to it.
    This also allowes us to remove the ad-hoc passing of the resolver in
    query_imsg. Since the callback functions all need access to the
    resolver that did the work we pass it in as first argument.

    OK otto

1 files changed, 1 insertions, 2 deletions

diff --git a/sbin/unwind/unwind.h b/sbin/unwind/unwind.h
index 9e762681ac7..7079ec3ed72 100644
--- a/sbin/unwind/unwind.h
+++ b/sbin/unwind/unwind.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: unwind.h,v 1.26 2019/11/12 15:34:37 florian Exp $	*/
+/*	$OpenBSD: unwind.h,v 1.27 2019/11/14 08:30:10 florian Exp $	*/
 
 /*
  * Copyright (c) 2018 Florian Obser <florian@openbsd.org>
@@ -153,7 +153,6 @@ struct query_imsg {
 	int		 c;
 	int		 err;
 	int		 bogus;
-	void		*resolver;
 	struct timespec	 tp;
 };