resolve: shorten conf parser name and realign gperf table

diff --git a/src/resolve/resolved-dnssd-gperf.gperf b/src/resolve/resolved-dnssd-gperf.gperf
index bb0d8c3bf14981ea2e9295507f4a3661d6ada964..0bf07114100126ee2a82f8d28d03ead011d5a928 100644 (file)
--- a/src/resolve/resolved-dnssd-gperf.gperf
+++ b/src/resolve/resolved-dnssd-gperf.gperf
@@ -18,11 +18,11 @@ struct ConfigPerfItem;
 %struct-type
 %includes
 %%
-Service.Name,     config_parse_dnssd_registered_service_name,    0,                 0
-Service.Type,     config_parse_dnssd_registered_service_type,    0,                 0
-Service.SubType,  config_parse_dnssd_registered_service_subtype, 0,                 0
-Service.Port,     config_parse_ip_port,               0,                 offsetof(DnssdRegisteredService, port)
-Service.Priority, config_parse_uint16,                0,                 offsetof(DnssdRegisteredService, priority)
-Service.Weight,   config_parse_uint16,                0,                 offsetof(DnssdRegisteredService, weight)
-Service.TxtText,  config_parse_dnssd_txt,             DNS_TXT_ITEM_TEXT, 0
-Service.TxtData,  config_parse_dnssd_txt,             DNS_TXT_ITEM_DATA, 0
+Service.Name,     config_parse_dnssd_name,    0,                 0
+Service.Type,     config_parse_dnssd_type,    0,                 0
+Service.SubType,  config_parse_dnssd_subtype, 0,                 0
+Service.Port,     config_parse_ip_port,       0,                 offsetof(DnssdRegisteredService, port)
+Service.Priority, config_parse_uint16,        0,                 offsetof(DnssdRegisteredService, priority)
+Service.Weight,   config_parse_uint16,        0,                 offsetof(DnssdRegisteredService, weight)
+Service.TxtText,  config_parse_dnssd_txt,     DNS_TXT_ITEM_TEXT, 0
+Service.TxtData,  config_parse_dnssd_txt,     DNS_TXT_ITEM_DATA, 0

diff --git a/src/resolve/resolved-dnssd.c b/src/resolve/resolved-dnssd.c
index 8a6b9bcea4519586f019b13be72db74c60225a0e..93168c8c3d263feac1eb58dd87fc0c2b43a86291 100644 (file)
--- a/src/resolve/resolved-dnssd.c
+++ b/src/resolve/resolved-dnssd.c
@@ -413,7 +413,7 @@ int dnssd_signal_conflict(Manager *manager, const char *name) {
         return 0;
 }
 
-int config_parse_dnssd_registered_service_name(
+int config_parse_dnssd_name(
                 const char *unit,
                 const char *filename,
                 unsigned line,
@@ -467,7 +467,7 @@ int config_parse_dnssd_registered_service_name(
         return free_and_strdup_warn(&s->name_template, rvalue);
 }
 
-int config_parse_dnssd_registered_service_type(
+int config_parse_dnssd_type(
                 const char *unit,
                 const char *filename,
                 unsigned line,
@@ -503,7 +503,7 @@ int config_parse_dnssd_registered_service_type(
         return 0;
 }
 
-int config_parse_dnssd_registered_service_subtype(
+int config_parse_dnssd_subtype(
                 const char *unit,
                 const char *filename,
                 unsigned line,

diff --git a/src/resolve/resolved-dnssd.h b/src/resolve/resolved-dnssd.h
index d2c2ccd1336e63e7c16c491a2c0230f27d5bcb95..29c74791080a298e521a7f5eb2643837c8ba4766 100644 (file)
--- a/src/resolve/resolved-dnssd.h
+++ b/src/resolve/resolved-dnssd.h
@@ -63,7 +63,7 @@ int dnssd_signal_conflict(Manager *manager, const char *name);
 
 const struct ConfigPerfItem* resolved_dnssd_gperf_lookup(const char *key, GPERF_LEN_TYPE length);
 
-CONFIG_PARSER_PROTOTYPE(config_parse_dnssd_registered_service_name);
-CONFIG_PARSER_PROTOTYPE(config_parse_dnssd_registered_service_subtype);
-CONFIG_PARSER_PROTOTYPE(config_parse_dnssd_registered_service_type);
+CONFIG_PARSER_PROTOTYPE(config_parse_dnssd_name);
+CONFIG_PARSER_PROTOTYPE(config_parse_dnssd_subtype);
+CONFIG_PARSER_PROTOTYPE(config_parse_dnssd_type);
 CONFIG_PARSER_PROTOTYPE(config_parse_dnssd_txt);