diff options
| author | Michael Biebl <biebl@debian.org> | 2016-04-20 21:11:10 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2016-04-20 21:11:10 +0200 |
| commit | 78c3b8801ecf4975e5da1af3b10ae20dd2d876de (patch) | |
| tree | 19b80fbe9429f554a48ed126911026d4fa8a4b3f /shared | |
| parent | 288a08a3672a89a9bfdb8354b6863cc039759fc2 (diff) | |
Imported Upstream version 1.2.0 upstream/1.2.0
Diffstat (limited to 'shared')
| -rw-r--r-- | shared/nm-shared-utils.c | 34 | ||||
| -rw-r--r-- | shared/nm-shared-utils.h | 3 | ||||
| -rw-r--r-- | shared/nm-version-macros.h | 4 |
3 files changed, 39 insertions, 2 deletions
diff --git a/shared/nm-shared-utils.c b/shared/nm-shared-utils.c index 0ae54bdc..932b7432 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 f80c850c..cfa8f994 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/shared/nm-version-macros.h b/shared/nm-version-macros.h index b96b6c87..be94ce76 100644 --- a/shared/nm-version-macros.h +++ b/shared/nm-version-macros.h @@ -37,7 +37,7 @@ * Evaluates to the minor version number of NetworkManager which this source * is compiled against. */ -#define NM_MINOR_VERSION (1) +#define NM_MINOR_VERSION (2) /** * NM_MICRO_VERSION: @@ -45,7 +45,7 @@ * Evaluates to the micro version number of NetworkManager which this source * compiled against. */ -#define NM_MICRO_VERSION (94) +#define NM_MICRO_VERSION (0) /** * NM_CHECK_VERSION: |