From 2051944333d0f7d12cbeed90db28a0cb3c4f7132 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 23 Jan 2015 17:05:22 +0100 Subject: [PATCH] core: remove nm_match_spec_string() It was only used to match against "*", in a case-insensitive way. --- src/NetworkManagerUtils.c | 13 ------------- src/NetworkManagerUtils.h | 1 - src/devices/nm-device.c | 7 +++++-- 3 files changed, 5 insertions(+), 16 deletions(-) diff --git a/src/NetworkManagerUtils.c b/src/NetworkManagerUtils.c index e5ff3c265..0e4e17b00 100644 --- a/src/NetworkManagerUtils.c +++ b/src/NetworkManagerUtils.c @@ -864,19 +864,6 @@ nm_utils_find_helper(const char *progname, const char *try_first, GError **error /******************************************************************************************/ -gboolean -nm_match_spec_string (const GSList *specs, const char *match) -{ - const GSList *iter; - - for (iter = specs; iter; iter = g_slist_next (iter)) { - if (!g_ascii_strcasecmp ((const char *) iter->data, match)) - return TRUE; - } - - return FALSE; -} - #define MAC_TAG "mac:" #define INTERFACE_NAME_TAG "interface-name:" #define SUBCHAN_TAG "s390-subchannels:" diff --git a/src/NetworkManagerUtils.h b/src/NetworkManagerUtils.h index 049856556..7ed0c7aa9 100644 --- a/src/NetworkManagerUtils.h +++ b/src/NetworkManagerUtils.h @@ -96,7 +96,6 @@ const char *nm_utils_find_helper (const char *progname, const char *try_first, GError **error); -gboolean nm_match_spec_string (const GSList *specs, const char *string); gboolean nm_match_spec_hwaddr (const GSList *specs, const char *hwaddr); gboolean nm_match_spec_s390_subchannels (const GSList *specs, const char *subchannels); gboolean nm_match_spec_interface_name (const GSList *specs, const char *interface_name); diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index 9df3712ed..08ff47f8a 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -8088,9 +8088,12 @@ spec_match_list (NMDevice *self, const GSList *specs) { NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self); gboolean matched = FALSE; + const GSList *iter; - if (nm_match_spec_string (specs, "*")) - return TRUE; + for (iter = specs; iter; iter = g_slist_next (iter)) { + if (!strcmp ((const char *) iter->data, "*")) + return TRUE; + } if (priv->hw_addr_len) matched = nm_match_spec_hwaddr (specs, priv->hw_addr);