sd-resolv: rename to sd-resolve

[elogind.git] / src / libsystemd / test-resolve.c

diff --git a/src/libsystemd/test-resolv.c b/src/libsystemd/test-resolve.c
similarity index 77%
rename from src/libsystemd/test-resolv.c
rename to src/libsystemd/test-resolve.c
index 5baef9693a2b8fc5fb9052f7a0e620d3eeb375c2..c7feb1ecdb6108fce5e5408469f60d7d75cf7996 100644 (file)
--- a/src/libsystemd/test-resolv.c
+++ b/src/libsystemd/test-resolve.c
@@ -31,58 +31,58 @@
 #include <signal.h>
 #include <errno.h>
 
-#include "sd-resolv.h"
-#include "resolv-util.h"
+#include "sd-resolve.h"
+#include "resolve-util.h"
 #include "macro.h"
 
 int main(int argc, char *argv[]) {
         int r = 1, ret;
-        _cleanup_resolv_free_ sd_resolv_t *resolv = NULL;
-        _cleanup_resolv_addrinfo_free_ struct addrinfo *ai = NULL;
-        _cleanup_resolv_answer_free_ unsigned char *srv = NULL;
-        sd_resolv_query_t *q1, *q2, *q3;
+        _cleanup_resolve_free_ sd_resolve_t *resolve = NULL;
+        _cleanup_resolve_addrinfo_free_ struct addrinfo *ai = NULL;
+        _cleanup_resolve_answer_free_ unsigned char *srv = NULL;
+        sd_resolve_query_t *q1, *q2, *q3;
         struct addrinfo hints = {};
         struct sockaddr_in sa = {};
         char host[NI_MAXHOST] = "", serv[NI_MAXSERV] = "";
 
         signal(SIGCHLD, SIG_IGN);
 
-        resolv = sd_resolv_new(2);
-        if (!resolv)
+        resolve = sd_resolve_new(2);
+        if (!resolve)
                 log_oom();
 
         /* Make a name -> address query */
         hints.ai_family = PF_UNSPEC;
         hints.ai_socktype = SOCK_STREAM;
 
-        q1 = sd_resolv_getaddrinfo(resolv, argc >= 2 ? argv[1] : "www.heise.de", NULL, &hints);
+        q1 = sd_resolve_getaddrinfo(resolve, argc >= 2 ? argv[1] : "www.heise.de", NULL, &hints);
         if (!q1)
-                fprintf(stderr, "sd_resolv_getaddrinfo(): %s\n", strerror(errno));
+                fprintf(stderr, "sd_resolve_getaddrinfo(): %s\n", strerror(errno));
 
         /* Make an address -> name query */
         sa.sin_family = AF_INET;
         sa.sin_addr.s_addr = inet_addr(argc >= 3 ? argv[2] : "193.99.144.71");
         sa.sin_port = htons(80);
 
-        q2 = sd_resolv_getnameinfo(resolv, (struct sockaddr*) &sa, sizeof(sa), 0, 1, 1);
+        q2 = sd_resolve_getnameinfo(resolve, (struct sockaddr*) &sa, sizeof(sa), 0, 1, 1);
         if (!q2)
-                fprintf(stderr, "sd_resolv_getnameinfo(): %s\n", strerror(errno));
+                fprintf(stderr, "sd_resolve_getnameinfo(): %s\n", strerror(errno));
 
         /* Make a res_query() call */
-        q3 = sd_resolv_res_query(resolv, "_xmpp-client._tcp.gmail.com", C_IN, T_SRV);
+        q3 = sd_resolve_res_query(resolve, "_xmpp-client._tcp.gmail.com", C_IN, T_SRV);
         if (!q3)
-                fprintf(stderr, "sd_resolv_res_query(): %s\n", strerror(errno));
+                fprintf(stderr, "sd_resolve_res_query(): %s\n", strerror(errno));
 
         /* Wait until the three queries are completed */
-        while (!sd_resolv_isdone(resolv, q1) ||
-               !sd_resolv_isdone(resolv, q2) ||
-               !sd_resolv_isdone(resolv, q3)) {
-                if (sd_resolv_wait(resolv, 1) < 0)
-                        fprintf(stderr, "sd_resolv_wait(): %s\n", strerror(errno));
+        while (!sd_resolve_isdone(resolve, q1) ||
+               !sd_resolve_isdone(resolve, q2) ||
+               !sd_resolve_isdone(resolve, q3)) {
+                if (sd_resolve_wait(resolve, 1) < 0)
+                        fprintf(stderr, "sd_resolve_wait(): %s\n", strerror(errno));
         }
 
         /* Interpret the result of the name -> addr query */
-        ret = sd_resolv_getaddrinfo_done(resolv, q1, &ai);
+        ret = sd_resolve_getaddrinfo_done(resolve, q1, &ai);
         if (ret)
                 fprintf(stderr, "error: %s %i\n", gai_strerror(ret), ret);
         else {
@@ -102,14 +102,14 @@ int main(int argc, char *argv[]) {
         }
 
         /* Interpret the result of the addr -> name query */
-        ret = sd_resolv_getnameinfo_done(resolv, q2, host, sizeof(host), serv, sizeof(serv));
+        ret = sd_resolve_getnameinfo_done(resolve, q2, host, sizeof(host), serv, sizeof(serv));
         if (ret)
                 fprintf(stderr, "error: %s %i\n", gai_strerror(ret), ret);
         else
                 printf("%s -- %s\n", host, serv);
 
         /* Interpret the result of the SRV lookup */
-        ret = sd_resolv_res_done(resolv, q3, &srv);
+        ret = sd_resolve_res_done(resolve, q3, &srv);
         if (ret < 0) {
                 fprintf(stderr, "error: %s %i\n", strerror(errno), ret);
         } else if (ret == 0) {