colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

core: remove nm_match_spec_string()

Browse Source 
It was only used to match against "*", in a case-insensitive
way.
This commit is contained in:
Thomas Haller
2015-01-23 17:05:22 +01:00
parent 2b518538be
commit 2051944333
3 changed files with 5 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/NetworkManagerUtils.c
View File

@@ -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 MAC_TAG "mac:"
#define INTERFACE_NAME_TAG "interface-name:" #define INTERFACE_NAME_TAG "interface-name:"
#define SUBCHAN_TAG "s390-subchannels:" #define SUBCHAN_TAG "s390-subchannels:"

1
src/NetworkManagerUtils.h
View File

@@ -96,7 +96,6 @@ const char *nm_utils_find_helper (const char *progname,
const char *try_first, const char *try_first,
GError **error); 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_hwaddr (const GSList *specs, const char *hwaddr);
gboolean nm_match_spec_s390_subchannels (const GSList *specs, const char *subchannels); 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); gboolean nm_match_spec_interface_name (const GSList *specs, const char *interface_name);

7
src/devices/nm-device.c
View File

@@ -8088,9 +8088,12 @@ spec_match_list (NMDevice *self, const GSList *specs)
{ {
NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self); NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self);
gboolean matched = FALSE; gboolean matched = FALSE;
const GSList *iter;
if (nm_match_spec_string (specs, "*")) for (iter = specs; iter; iter = g_slist_next (iter)) {
return TRUE; if (!strcmp ((const char *) iter->data, "*"))
return TRUE;
}
if (priv->hw_addr_len) if (priv->hw_addr_len)
matched = nm_match_spec_hwaddr (specs, priv->hw_addr); matched = nm_match_spec_hwaddr (specs, priv->hw_addr);