From 5b3ce021861b157c89ebc48e21149aa74ea14c13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dag-Erling=20Sm=C3=B8rgrav?= <des@FreeBSD.org>
Date: Mon, 15 Mar 2004 17:08:28 +0000
Subject: [PATCH] Don't try to pass off a struct sockaddr as a struct
 sockaddr_in when it may in fact very well be a struct sockaddr_in6.  Just use
 plain struct sockaddr.

This brings us yet another step closer to a clean -O2 build.
---
 include/resolv.h        | 4 ++--
 lib/libc/net/res_send.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/resolv.h b/include/resolv.h
index 942d2d6f8721..800f73c51da2 100644
--- a/include/resolv.h
+++ b/include/resolv.h
@@ -180,14 +180,14 @@ struct __res_state_ext {
 typedef enum { res_goahead, res_nextns, res_modified, res_done, res_error }
 	res_sendhookact;
 
-typedef res_sendhookact (*res_send_qhook)(struct sockaddr_in * const *ns,
+typedef res_sendhookact (*res_send_qhook)(struct sockaddr * const *ns,
 					  const u_char **query,
 					  int *querylen,
 					  u_char *ans,
 					  int anssiz,
 					  int *resplen);
 
-typedef res_sendhookact (*res_send_rhook)(const struct sockaddr_in *ns,
+typedef res_sendhookact (*res_send_rhook)(const struct sockaddr *ns,
 					  const u_char *query,
 					  int querylen,
 					  u_char *ans,
diff --git a/lib/libc/net/res_send.c b/lib/libc/net/res_send.c
index d39bbc5a09fa..6885ffd0dc02 100644
--- a/lib/libc/net/res_send.c
+++ b/lib/libc/net/res_send.c
@@ -415,7 +415,7 @@ res_send(buf, buflen, ans, anssiz)
 			do {
 				res_sendhookact act;
 
-				act = (*Qhook)((struct sockaddr_in **)&nsap,
+				act = (*Qhook)(&nsap,
 					       &buf, &buflen,
 					       ans, anssiz, &resplen);
 				switch (act) {
@@ -871,7 +871,7 @@ res_send(buf, buflen, ans, anssiz)
 			do {
 				res_sendhookact act;
 
-				act = (*Rhook)((struct sockaddr_in *)nsap,
+				act = (*Rhook)(nsap,
 					       buf, buflen,
 					       ans, anssiz, &resplen);
 				switch (act) {