From: Yu Watanabe Date: Tue, 29 May 2018 03:40:28 +0000 (+0900) Subject: socket-util: rename parse_socket_address_bind_ipv6_only_or_bool() to socket_address_b... X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=e0859c38297467dc93b122aea38c806f2483e7a3;p=elogind.git socket-util: rename parse_socket_address_bind_ipv6_only_or_bool() to socket_address_bind_ipv6_only_or_bool_from_string() Hence, we can define config_parse_socket_bind() by using DEFINE_CONFIG_PARSE_ENUM() macro. --- diff --git a/src/basic/socket-util.c b/src/basic/socket-util.c index 75bfcf98a..177f2aa4f 100644 --- a/src/basic/socket-util.c +++ b/src/basic/socket-util.c @@ -813,7 +813,7 @@ static const char* const socket_address_bind_ipv6_only_table[_SOCKET_ADDRESS_BIN DEFINE_STRING_TABLE_LOOKUP(socket_address_bind_ipv6_only, SocketAddressBindIPv6Only); -SocketAddressBindIPv6Only parse_socket_address_bind_ipv6_only_or_bool(const char *n) { +SocketAddressBindIPv6Only socket_address_bind_ipv6_only_or_bool_from_string(const char *n) { int r; r = parse_boolean(n); diff --git a/src/basic/socket-util.h b/src/basic/socket-util.h index e9aa17f4d..bf99f4107 100644 --- a/src/basic/socket-util.h +++ b/src/basic/socket-util.h @@ -121,7 +121,7 @@ int socknameinfo_pretty(union sockaddr_union *sa, socklen_t salen, char **_ret); const char* socket_address_bind_ipv6_only_to_string(SocketAddressBindIPv6Only b) _const_; SocketAddressBindIPv6Only socket_address_bind_ipv6_only_from_string(const char *s) _pure_; -SocketAddressBindIPv6Only parse_socket_address_bind_ipv6_only_or_bool(const char *s); +SocketAddressBindIPv6Only socket_address_bind_ipv6_only_or_bool_from_string(const char *s); int netlink_family_to_string_alloc(int b, char **s); int netlink_family_from_string(const char *s) _pure_;