Changeset 8fdb18e in mainline for uspace/app/dnsres/dnsres.c

Timestamp:

2013-05-03T14:51:30Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

5d1cb8a

Parents:

ef904895 (diff), 1c7ba2d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• uspace/app/dnsres/dnsres.c (modified) (3 diffs)

uspace/app/dnsres/dnsres.c

@@ -34 +34 @@
 
 #include <errno.h>
+#include <inet/addr.h>
 #include <inet/dnsr.h>
 #include <stdio.h>
@@ -43 +44 @@
 {
         printf("syntax: " NAME " <host-name>\n");
-}
-
-static int addr_format(inet_addr_t *addr, char **bufp)
-{
-        int rc;
-
-        rc = asprintf(bufp, "%d.%d.%d.%d", addr->ipv4 >> 24,
-            (addr->ipv4 >> 16) & 0xff, (addr->ipv4 >> 8) & 0xff,
-            addr->ipv4 & 0xff);
-
-        if (rc < 0)
-                return ENOMEM;
-
-        return EOK;
 }
 
@@ -76 +63 @@
         }
 
-        rc = addr_format(&hinfo->addr, &saddr);
+        rc = inet_addr_format(&hinfo->addr, &saddr);
         if (rc != EOK) {
                 dnsr_hostinfo_destroy(hinfo);