diff options
author | Thomas Haller <thaller@redhat.com> | 2016-04-18 17:11:49 +0200 |
---|---|---|
committer | Thomas Haller <thaller@redhat.com> | 2016-04-19 15:14:17 +0200 |
commit | 7e41c15ace01e7bf940c8d355b8cb67fee223d3d (patch) | |
tree | 9f6b1ffc19624323cd10680fc8e2327794a5a26c | |
parent | e3e7a25429acf9e785aa31b87ee913d9d62d2647 (diff) | |
download | NetworkManager-7e41c15ace01e7bf940c8d355b8cb67fee223d3d.tar.gz |
shared: move nm_utils_ascii_str_to_bool() to shared/nm-shared-utils.h
(cherry picked from commit 186787744c5678f60c054b1223a44e7890901f11)
-rw-r--r-- | shared/nm-shared-utils.c | 34 | ||||
-rw-r--r-- | shared/nm-shared-utils.h | 3 | ||||
-rw-r--r-- | src/nm-config.c | 2 | ||||
-rw-r--r-- | src/nm-core-utils.c | 34 | ||||
-rw-r--r-- | src/nm-core-utils.h | 5 |
5 files changed, 38 insertions, 40 deletions
diff --git a/shared/nm-shared-utils.c b/shared/nm-shared-utils.c index 0ae54bdcf0..932b7432c3 100644 --- a/shared/nm-shared-utils.c +++ b/shared/nm-shared-utils.c @@ -102,6 +102,40 @@ _nm_utils_ascii_str_to_int64 (const char *str, guint base, gint64 min, gint64 ma /*****************************************************************************/ +gint +_nm_utils_ascii_str_to_bool (const char *str, + gint default_value) +{ + gsize len; + char *s = NULL; + + if (!str) + return default_value; + + while (str[0] && g_ascii_isspace (str[0])) + str++; + + if (!str[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")) + 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; +} + +/*****************************************************************************/ + G_DEFINE_QUARK (nm-utils-error-quark, nm_utils_error) void diff --git a/shared/nm-shared-utils.h b/shared/nm-shared-utils.h index f80c850c69..cfa8f994f7 100644 --- a/shared/nm-shared-utils.h +++ b/shared/nm-shared-utils.h @@ -26,6 +26,9 @@ gint64 _nm_utils_ascii_str_to_int64 (const char *str, guint base, gint64 min, gint64 max, gint64 fallback); +gint _nm_utils_ascii_str_to_bool (const char *str, + gint default_value); + /******************************************************************************/ /** diff --git a/src/nm-config.c b/src/nm-config.c index 58fd96cbf4..8bca6870e1 100644 --- a/src/nm-config.c +++ b/src/nm-config.c @@ -125,7 +125,7 @@ gint nm_config_parse_boolean (const char *str, gint default_value) { - return nm_utils_ascii_str_to_bool (str, default_value); + return _nm_utils_ascii_str_to_bool (str, default_value); } gint diff --git a/src/nm-core-utils.c b/src/nm-core-utils.c index 714aaa9279..bbe466545d 100644 --- a/src/nm-core-utils.c +++ b/src/nm-core-utils.c @@ -154,40 +154,6 @@ _nm_singleton_instance_register_destruction (GObject *instance) /*****************************************************************************/ -gint -nm_utils_ascii_str_to_bool (const char *str, - gint default_value) -{ - gsize len; - char *s = NULL; - - if (!str) - return default_value; - - while (str[0] && g_ascii_isspace (str[0])) - str++; - - if (!str[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")) - 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; -} - -/*****************************************************************************/ - /* * nm_ethernet_address_is_valid: * @addr: pointer to a binary or ASCII Ethernet address diff --git a/src/nm-core-utils.h b/src/nm-core-utils.h index 280be04736..528288c34c 100644 --- a/src/nm-core-utils.h +++ b/src/nm-core-utils.h @@ -91,11 +91,6 @@ GETTER (void) \ /*****************************************************************************/ -gint nm_utils_ascii_str_to_bool (const char *str, - gint default_value); - -/*****************************************************************************/ - gboolean nm_ethernet_address_is_valid (gconstpointer addr, gssize len); in_addr_t nm_utils_ip4_address_clear_host_address (in_addr_t addr, guint8 plen); |