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.
This commit is contained in:
Lennart Poettering
2014-07-18 16:15:12 +02:00
parent 0dd25fb9f0
commit 46f08bea4b
3 changed files with 3 additions and 17 deletions
+3 -2
View File
@@ -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);
-12
View File
@@ -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);
-3
View File
@@ -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_;