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

libnm: set errno in nm_key_file_get_boolean() to distinguish between missing key and error

Browse source 
This is also what nm_keyfile_plugin_kf_get_int64() does. It's useful to
know whether a value was missing or invalid.
This commit is contained in:
Thomas Haller 2019-08-02 23:13:33 +02:00
parent 1533a3e5d1
commit cc7b2cde95
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
libnm-core/nm-keyfile-utils.c
View file

@ -49,18 +49,28 @@
* to detect parsing failures. * to detect parsing failures.
* *
* Returns: either %TRUE or %FALSE if the key exists and is parsable as a boolean. * Returns: either %TRUE or %FALSE if the key exists and is parsable as a boolean.
* Otherwise, @default_value. * Otherwise, @default_value. Sets errno to ENODATA, EINVAL or 0, depending on whether
* the key exists, whether the value is invalid, or success.
*/ */
int int
nm_key_file_get_boolean (GKeyFile *kf, const char *group, const char *key, int default_value) nm_key_file_get_boolean (GKeyFile *kf, const char *group, const char *key, int default_value)
{ {
int v;
gs_free char *value = NULL; gs_free char *value = NULL;
value = g_key_file_get_value (kf, group, key, NULL); value = g_key_file_get_value (kf, group, key, NULL);
if (!value) if (!value) {
errno = ENODATA;
return default_value; return default_value;
return _nm_utils_ascii_str_to_bool (value, default_value); }
v = _nm_utils_ascii_str_to_bool (value, -1);
if (v != -1) {
errno = 0;
return v;
}
errno = EINVAL;
return default_value;
} }
/*****************************************************************************/ /*****************************************************************************/