diff options
| author | Michael Biebl <biebl@debian.org> | 2018-09-08 17:44:06 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2018-09-08 17:44:06 +0200 |
| commit | 8f7a3cbbdd0c0a48277c341dd3a8ec8743ae9735 (patch) | |
| tree | 4353551fcb59cc822c3cadf2f4888f70601e8fbf /src/nm-config-data.c | |
| parent | caf1db9d6fbc056cc6c76a24574890f6c7895f3d (diff) | |
New upstream version 1.13.90 upstream/1.13.90
Diffstat (limited to 'src/nm-config-data.c')
| -rw-r--r-- | src/nm-config-data.c | 36 |
1 files changed, 25 insertions, 11 deletions
diff --git a/src/nm-config-data.c b/src/nm-config-data.c index 813ef9c8..8d84e74a 100644 --- a/src/nm-config-data.c +++ b/src/nm-config-data.c @@ -183,11 +183,11 @@ nm_config_data_has_value (const NMConfigData *self, const char *group, const cha return !!value; } -gint -nm_config_data_get_value_boolean (const NMConfigData *self, const char *group, const char *key, gint default_value) +int +nm_config_data_get_value_boolean (const NMConfigData *self, const char *group, const char *key, int default_value) { char *str; - gint value = default_value; + int value = default_value; g_return_val_if_fail (NM_IS_CONFIG_DATA (self), default_value); g_return_val_if_fail (group && *group, default_value); @@ -655,12 +655,12 @@ nm_config_data_log (const NMConfigData *self, const char *group = default_values[g].group; gssize idx; - idx = _nm_utils_array_find_binary_search ((gconstpointer *) groups_full->pdata, - sizeof (char *), - groups_full->len, - &group, - (GCompareDataFunc) _nm_config_data_log_sort, - NULL); + idx = nm_utils_array_find_binary_search ((gconstpointer *) groups_full->pdata, + sizeof (char *), + groups_full->len, + &group, + (GCompareDataFunc) _nm_config_data_log_sort, + NULL); if (idx < 0) g_ptr_array_insert (groups_full, (~idx), (gpointer) group); } @@ -1335,8 +1335,8 @@ gboolean nm_config_data_get_device_config_boolean (const NMConfigData *self, const char *property, NMDevice *device, - gint val_no_match, - gint val_invalid) + int val_no_match, + int val_invalid) { gs_free char *value = NULL; gboolean has_match; @@ -1371,6 +1371,20 @@ nm_config_data_get_connection_default (const NMConfigData *self, return value; } +gint64 +nm_config_data_get_connection_default_int64 (const NMConfigData *self, + const char *property, + NMDevice *device, + gint64 min, + gint64 max, + gint64 fallback) +{ + gs_free char *value = NULL; + + value = nm_config_data_get_connection_default (self, property, device); + return _nm_utils_ascii_str_to_int64 (value, 10, min, max, fallback); +} + static void _get_connection_info_init (MatchSectionInfo *connection_info, GKeyFile *keyfile, char *group) { |