diff options
author | Thomas Haller <thaller@redhat.com> | 2019-10-15 12:53:53 +0200 |
---|---|---|
committer | Thomas Haller <thaller@redhat.com> | 2019-10-18 22:09:18 +0200 |
commit | 419ce1178e650ad437a206e8d000380dd074d8fc (patch) | |
tree | 07e8ff81b7b566eea16d1a333db26fa658112d84 | |
parent | 166095fe4e2d9b7c44e7c794909cad9e405f75f4 (diff) | |
download | NetworkManager-419ce1178e650ad437a206e8d000380dd074d8fc.tar.gz |
libnm: move wincaps_to_dash() function to "nm-libnm-utils.h"
We will need it, if only for testing/asserting.
-rw-r--r-- | libnm/nm-libnm-utils.c | 24 | ||||
-rw-r--r-- | libnm/nm-libnm-utils.h | 4 | ||||
-rw-r--r-- | libnm/nm-object.c | 25 |
3 files changed, 30 insertions, 23 deletions
diff --git a/libnm/nm-libnm-utils.c b/libnm/nm-libnm-utils.c index b5a5fbd82b..7d34d2fd41 100644 --- a/libnm/nm-libnm-utils.c +++ b/libnm/nm-libnm-utils.c @@ -89,6 +89,30 @@ _nml_dbus_log (NMLDBusLogLevel level, /*****************************************************************************/ +/* Stolen from dbus-glib */ +char * +nm_utils_wincaps_to_dash (const char *caps) +{ + const char *p; + GString *str; + + str = g_string_new (NULL); + p = caps; + while (*p) { + if (g_ascii_isupper (*p)) { + if (str->len > 0 && (str->len < 2 || str->str[str->len-2] != '-')) + g_string_append_c (str, '-'); + g_string_append_c (str, g_ascii_tolower (*p)); + } else + g_string_append_c (str, *p); + ++p; + } + + return g_string_free (str, FALSE); +} + +/*****************************************************************************/ + static char * _fixup_string (const char *desc, const char *const *ignored_phrases, diff --git a/libnm/nm-libnm-utils.h b/libnm/nm-libnm-utils.h index 5bad641b34..3708fa4f57 100644 --- a/libnm/nm-libnm-utils.h +++ b/libnm/nm-libnm-utils.h @@ -106,6 +106,10 @@ void _nml_dbus_log (NMLDBusLogLevel level, /*****************************************************************************/ +char *nm_utils_wincaps_to_dash (const char *caps); + +/*****************************************************************************/ + char *nm_utils_fixup_vendor_string (const char *desc); char *nm_utils_fixup_product_string (const char *desc); diff --git a/libnm/nm-object.c b/libnm/nm-object.c index dce7a0f74f..a0d2f8611b 100644 --- a/libnm/nm-object.c +++ b/libnm/nm-object.c @@ -12,6 +12,7 @@ #include <stdio.h> #include "nm-utils.h" +#include "nm-libnm-utils.h" #include "nm-dbus-interface.h" #include "nm-object-private.h" #include "nm-dbus-helpers.h" @@ -539,28 +540,6 @@ odata_free (gpointer data) static void object_property_maybe_complete (NMObject *self); -/* Stolen from dbus-glib */ -static char* -wincaps_to_dash (const char *caps) -{ - const char *p; - GString *str; - - str = g_string_new (NULL); - p = caps; - while (*p) { - if (g_ascii_isupper (*p)) { - if (str->len > 0 && (str->len < 2 || str->str[str->len-2] != '-')) - g_string_append_c (str, '-'); - g_string_append_c (str, g_ascii_tolower (*p)); - } else - g_string_append_c (str, *p); - ++p; - } - - return g_string_free (str, FALSE); -} - /* Adds object to array if it's not already there */ static void add_to_object_array_unique (GPtrArray *array, GObject *obj) @@ -877,7 +856,7 @@ handle_property_changed (NMObject *self, const char *dbus_name, GVariant *value) gboolean success = FALSE, found = FALSE; GSList *iter; - prop_name = wincaps_to_dash (dbus_name); + prop_name = nm_utils_wincaps_to_dash (dbus_name); /* Iterate through the object and its parents to find the property */ for (iter = priv->property_tables; iter; iter = g_slist_next (iter)) { |