From: Tom Gundersen <teg@jklm.no>
Date: Fri, 13 Feb 2015 23:32:56 +0000 (+0100)
Subject: networkd: network - rename ipv6token parser
X-Git-Tag: v219~28
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=60c35566600f45350c37f152c1093018972bd9a5

networkd: network - rename ipv6token parser

Too generic name.
---

diff --git a/src/network/networkd-network-gperf.gperf b/src/network/networkd-network-gperf.gperf
index 2aa30a2b0..fc277df94 100644
--- a/src/network/networkd-network-gperf.gperf
+++ b/src/network/networkd-network-gperf.gperf
@@ -38,7 +38,7 @@ Network.DHCP,                config_parse_dhcp,                  0,
 Network.DHCPServer,          config_parse_bool,                  0,                             offsetof(Network, dhcp_server)
 Network.LinkLocalAddressing, config_parse_address_family_boolean,0,                             offsetof(Network, link_local)
 Network.IPv4LLRoute,         config_parse_bool,                  0,                             offsetof(Network, ipv4ll_route)
-Network.IPv6Token,           config_parse_token,                 0,                             offsetof(Network, ipv6_token)
+Network.IPv6Token,           config_parse_ipv6token,             0,                             offsetof(Network, ipv6_token)
 Network.LLDP,                config_parse_bool,                  0,                             offsetof(Network, lldp)
 Network.Address,             config_parse_address,               0,                             0
 Network.Gateway,             config_parse_gateway,               0,                             0
diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c
index c90f730f1..35ac064cf 100644
--- a/src/network/networkd-network.c
+++ b/src/network/networkd-network.c
@@ -651,7 +651,7 @@ int config_parse_llmnr(
         return 0;
 }
 
-int config_parse_token(
+int config_parse_ipv6token(
                 const char* unit,
                 const char *filename,
                 unsigned line,
diff --git a/src/network/networkd.h b/src/network/networkd.h
index 7f1f06c81..bdb2f20e2 100644
--- a/src/network/networkd.h
+++ b/src/network/networkd.h
@@ -411,9 +411,9 @@ int config_parse_ipv4ll(const char *unit, const char *filename, unsigned line,
                         int ltype, const char *rvalue, void *data, void *userdata);
 
 /* IPv6 support */
-int config_parse_token(const char *unit, const char *filename, unsigned line,
-                       const char *section, unsigned section_line, const char *lvalue,
-                       int ltype, const char *rvalue, void *data, void *userdata);
+int config_parse_ipv6token(const char *unit, const char *filename, unsigned line,
+                           const char *section, unsigned section_line, const char *lvalue,
+                           int ltype, const char *rvalue, void *data, void *userdata);
 
 /* LLMNR support */