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

shared: cleanup _nm_utils_ascii_str_to_bool()

Browse source 
Previously, this would re-implement what nm_strstrip_avoid_copy()
was doing.

Use nm_strstrip_avoid_copy_a() instead, which avoids the code
duplication and the heap allocation in common cases.
This commit is contained in:
Thomas Haller 2019-04-02 12:24:40 +02:00
parent 2861a7ae0a
commit df89f57c1d
1 changed files with 14 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
shared/nm-utils/nm-shared-utils.c
View file

@ -1181,31 +1181,27 @@ int
_nm_utils_ascii_str_to_bool (const char *str,
int default_value)
{
gsize len;
char *s = NULL;
gs_free char *str_free = NULL;
if (!str)
return default_value;
while (str[0] && g_ascii_isspace (str[0]))
str++;
if (!str[0])
str = nm_strstrip_avoid_copy_a (300, str, &str_free);
if (str[0] == '\0')
return default_value;
len = strlen (str);
if (g_ascii_isspace (str[len - 1])) {
s = g_strdup (str);
g_strchomp (s);
str = s;
}
if ( !g_ascii_strcasecmp (str, "true")
|| !g_ascii_strcasecmp (str, "yes")
|| !g_ascii_strcasecmp (str, "on")
|| !g_ascii_strcasecmp (str, "1"))
return TRUE;
if ( !g_ascii_strcasecmp (str, "false")
|| !g_ascii_strcasecmp (str, "no")
|| !g_ascii_strcasecmp (str, "off")
|| !g_ascii_strcasecmp (str, "0"))
return FALSE;
if (!g_ascii_strcasecmp (str, "true") || !g_ascii_strcasecmp (str, "yes") || !g_ascii_strcasecmp (str, "on") || !g_ascii_strcasecmp (str, "1"))
default_value = TRUE;
else if (!g_ascii_strcasecmp (str, "false") || !g_ascii_strcasecmp (str, "no") || !g_ascii_strcasecmp (str, "off") || !g_ascii_strcasecmp (str, "0"))
default_value = FALSE;
if (s)
g_free (s);
return default_value;
}