diff options
Diffstat (limited to 'src/nm-config-data.c')
| -rw-r--r-- | src/nm-config-data.c | 36 |
1 files changed, 11 insertions, 25 deletions
diff --git a/src/nm-config-data.c b/src/nm-config-data.c index 8d84e74a..813ef9c8 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; } -int -nm_config_data_get_value_boolean (const NMConfigData *self, const char *group, const char *key, int default_value) +gint +nm_config_data_get_value_boolean (const NMConfigData *self, const char *group, const char *key, gint default_value) { char *str; - int value = default_value; + gint 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, - int val_no_match, - int val_invalid) + gint val_no_match, + gint val_invalid) { gs_free char *value = NULL; gboolean has_match; @@ -1371,20 +1371,6 @@ 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) { |