fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-02-04 14:10:36 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

libnm: move wincaps_to_dash() function to "nm-libnm-utils.h"

Browse source 
We will need it, if only for testing/asserting.
This commit is contained in:
Thomas Haller 2019-10-15 12:53:53 +02:00
parent 166095fe4e
commit 419ce1178e
3 changed files with 30 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
libnm/nm-libnm-utils.c
View file

@ -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,

4
libnm/nm-libnm-utils.h
View file

@ -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);

25
libnm/nm-object.c
View file

@ -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)) {