From f73621a545477eb8a66debb0481fb9b49ee19a7c Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Mon, 21 Mar 2016 16:43:09 +0100 Subject: [PATCH] dns: refactor NMDnsManagerResolvConfMode to string conversion --- src/dns-manager/nm-dns-manager.c | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/src/dns-manager/nm-dns-manager.c b/src/dns-manager/nm-dns-manager.c index 610e4365c..26f3b2cb9 100644 --- a/src/dns-manager/nm-dns-manager.c +++ b/src/dns-manager/nm-dns-manager.c @@ -161,6 +161,13 @@ typedef struct { GPtrArray *nis_servers; } NMResolvConfData; +NM_UTILS_LOOKUP_STR_DEFINE_STATIC (_rc_manager_to_string, NMDnsManagerResolvConfManager, + NM_UTILS_LOOKUP_DEFAULT_WARN (NULL), + NM_UTILS_LOOKUP_STR_ITEM (NM_DNS_MANAGER_RESOLV_CONF_MAN_NONE, "none"), + NM_UTILS_LOOKUP_STR_ITEM (NM_DNS_MANAGER_RESOLV_CONF_MAN_RESOLVCONF, "resolvconf"), + NM_UTILS_LOOKUP_STR_ITEM (NM_DNS_MANAGER_RESOLV_CONF_MAN_NETCONFIG, "netconfig"), +); + static void add_string_item (GPtrArray *array, const char *str) { @@ -1374,7 +1381,7 @@ static void init_resolv_conf_manager (NMDnsManager *self) { NMDnsManagerPrivate *priv = NM_DNS_MANAGER_GET_PRIVATE (self); - const char *man, *desc = ""; + const char *man; man = nm_config_data_get_rc_manager (nm_config_get_data (priv->config)); if (!g_strcmp0 (man, "none")) @@ -1395,19 +1402,7 @@ init_resolv_conf_manager (NMDnsManager *self) _LOGW ("unknown resolv.conf manager '%s'", man); } - switch (priv->rc_manager) { - case NM_DNS_MANAGER_RESOLV_CONF_MAN_RESOLVCONF: - desc = "resolvconf"; - break; - case NM_DNS_MANAGER_RESOLV_CONF_MAN_NETCONFIG: - desc = "netconfig"; - break; - case NM_DNS_MANAGER_RESOLV_CONF_MAN_NONE: - desc = "none"; - break; - } - - _LOGI ("using resolv.conf manager '%s'", desc); + _LOGI ("using resolv.conf manager '%s'", _rc_manager_to_string (priv->rc_manager)); } static void