This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[PATCH COMMITTED] resolv: Move res_isourserver, res_send from res_data.c to res_send.c
- From: fweimer at redhat dot com (Florian Weimer)
- To: libc-alpha at sourceware dot org
- Date: Fri, 30 Jun 2017 12:39:05 +0200
- Subject: [PATCH COMMITTED] resolv: Move res_isourserver, res_send from res_data.c to res_send.c
- Authentication-results: sourceware.org; auth=none
- Authentication-results: ext-mx08.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com
- Authentication-results: ext-mx08.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=fweimer at redhat dot com
- Dkim-filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 95C48C057FA5
- Dmarc-filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 95C48C057FA5
2017-06-30 Florian Weimer <fweimer@redhat.com>
* resolv/res_data.c (res_isourserver, res_send): Move to ...
* resolv/res_send.c (res_isourserver, res_send): here.
diff --git a/resolv/res_data.c b/resolv/res_data.c
index d05389e..b790b4b 100644
--- a/resolv/res_data.c
+++ b/resolv/res_data.c
@@ -45,22 +45,6 @@ res_query(const char *name, /* domain name */
return (res_nquery(&_res, name, class, type, answer, anslen));
}
-int
-res_isourserver(const struct sockaddr_in *inp) {
- return (res_ourserver_p(&_res, (const struct sockaddr_in6 *) inp));
-}
-
-int
-res_send(const u_char *buf, int buflen, u_char *ans, int anssiz) {
- if (__res_maybe_init (&_res, 1) == -1) {
- /* errno should have been set by res_init() in this case. */
- return (-1);
- }
-
- return (res_nsend(&_res, buf, buflen, ans, anssiz));
-}
-
-
void
res_close(void) {
/*
diff --git a/resolv/res_send.c b/resolv/res_send.c
index 01b9b0e..a7daae8 100644
--- a/resolv/res_send.c
+++ b/resolv/res_send.c
@@ -243,6 +243,12 @@ res_ourserver_p(const res_state statp, const struct sockaddr_in6 *inp)
return (0);
}
+int
+res_isourserver (const struct sockaddr_in *inp)
+{
+ return res_ourserver_p (&_res, (const struct sockaddr_in6 *) inp);
+}
+
/* int
* res_nameinquery(name, type, class, buf, eom)
* look for (name,type,class) in the query section of packet (buf,eom)
@@ -544,6 +550,15 @@ res_nsend(res_state statp,
}
libresolv_hidden_def (res_nsend)
+int
+res_send (const unsigned char *buf, int buflen, unsigned char *ans, int anssiz)
+{
+ if (__res_maybe_init (&_res, 1) == -1)
+ /* errno should have been set by res_init in this case. */
+ return -1;
+ return res_nsend (&_res, buf, buflen, ans, anssiz);
+}
+
/* Private */
static struct sockaddr *