From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 18 Jul 2014 14:15:12 +0000 (+0200)
Subject: in-addr-util: remove family_to_string() API
X-Git-Tag: v216~502
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=46f08bea4b09e2cce4b50e3c082df4a92a22598c;hp=0dd25fb9f005d8ab7ac4bc10a609d00569f8c56a

in-addr-util: remove family_to_string() API

we already have a more complete one with af_to_name(), that is generated
from the header files, no need to duplicate this.
---

diff --git a/src/resolve/resolved-dns-scope.c b/src/resolve/resolved-dns-scope.c
index 38b64905a..e74fcd449 100644
--- a/src/resolve/resolved-dns-scope.c
+++ b/src/resolve/resolved-dns-scope.c
@@ -23,6 +23,7 @@
 
 #include "strv.h"
 #include "socket-util.h"
+#include "af-list.h"
 #include "resolved-dns-domain.h"
 #include "resolved-dns-scope.h"
 
@@ -47,7 +48,7 @@ int dns_scope_new(Manager *m, DnsScope **ret, Link *l, DnsProtocol protocol, int
 
         dns_scope_llmnr_membership(s, true);
 
-        log_debug("New scope on link %s, protocol %s, family %s", strna(l ? l->name : NULL), dns_protocol_to_string(protocol), family_to_string(family));
+        log_debug("New scope on link %s, protocol %s, family %s", l ? l->name : "*", dns_protocol_to_string(protocol), family == AF_UNSPEC ? "*" : af_to_name(family));
 
         *ret = s;
         return 0;
@@ -57,7 +58,7 @@ DnsScope* dns_scope_free(DnsScope *s) {
         if (!s)
                 return NULL;
 
-        log_debug("Removing scope on link %s, protocol %s, family %s", strna(s->link ? s->link->name : NULL), dns_protocol_to_string(s->protocol), family_to_string(s->family));
+        log_debug("Removing scope on link %s, protocol %s, family %s", s->link ? s->link->name : "*", dns_protocol_to_string(s->protocol), s->family == AF_UNSPEC ? "*" : af_to_name(s->family));
 
         dns_scope_llmnr_membership(s, false);
 
diff --git a/src/shared/in-addr-util.c b/src/shared/in-addr-util.c
index ffbaa7431..ff008bd26 100644
--- a/src/shared/in-addr-util.c
+++ b/src/shared/in-addr-util.c
@@ -231,15 +231,3 @@ int in_addr_from_string_auto(const char *s, int *family, union in_addr_union *re
 
         return -EINVAL;
 }
-
-static const char* const family_table[] = {
-        [AF_UNSPEC] = "unspec",
-        [AF_UNIX] = "unix",
-        [AF_INET] = "inet",
-        [AF_INET6] = "inet6",
-        [AF_NETLINK] = "netlink",
-        [AF_PACKET] = "packet",
-        [AF_BLUETOOTH] = "bluetooth",
-        [AF_NFC] = "nfc",
-};
-DEFINE_STRING_TABLE_LOOKUP(family, int);
diff --git a/src/shared/in-addr-util.h b/src/shared/in-addr-util.h
index d76ea9dc3..98de032d9 100644
--- a/src/shared/in-addr-util.h
+++ b/src/shared/in-addr-util.h
@@ -43,6 +43,3 @@ static inline size_t FAMILY_ADDRESS_SIZE(int family) {
         assert(family == AF_INET || family == AF_INET6);
         return family == AF_INET6 ? 16 : 4;
 }
-
-const char* family_to_string(int i) _const_;
-int family_from_string(const char *s) _pure_;