diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2019-01-25 10:49:37 +0100 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2019-01-25 10:49:37 +0100 |
| commit | 404ebe62622150e77e311777dff8617eb974e834 (patch) | |
| tree | cc7f73d3e435d5b3ee85e2bef833e8de1fb133e3 /src/nm-config-data.h | |
| parent | 227c401a10a930af6fd5f123aef345fcd130d6aa (diff) | |
| parent | 3626b425d1bc017fdc6f1ea0cfd329d1e1681641 (diff) | |
Merge remote-tracking branch 'salsa/upstream' into upstream
Diffstat (limited to 'src/nm-config-data.h')
| -rw-r--r-- | src/nm-config-data.h | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/nm-config-data.h b/src/nm-config-data.h index 650fbe14..b52ddcc4 100644 --- a/src/nm-config-data.h +++ b/src/nm-config-data.h @@ -154,7 +154,7 @@ const char *nm_config_data_get_config_description (const NMConfigData *config_da gboolean nm_config_data_has_group (const NMConfigData *self, const char *group); gboolean nm_config_data_has_value (const NMConfigData *self, const char *group, const char *key, NMConfigGetValueFlags flags); char *nm_config_data_get_value (const NMConfigData *config_data, const char *group, const char *key, NMConfigGetValueFlags flags); -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); gint64 nm_config_data_get_value_int64 (const NMConfigData *self, const char *group, const char *key, guint base, gint64 min, gint64 max, gint64 fallback); char **nm_config_data_get_plugins (const NMConfigData *config_data, gboolean allow_default); @@ -181,6 +181,13 @@ char *nm_config_data_get_connection_default (const NMConfigData *self, const char *property, NMDevice *device); +gint64 nm_config_data_get_connection_default_int64 (const NMConfigData *self, + const char *property, + NMDevice *device, + gint64 min, + gint64 max, + gint64 fallback); + char *nm_config_data_get_device_config (const NMConfigData *self, const char *property, NMDevice *device, @@ -195,8 +202,8 @@ char *nm_config_data_get_device_config_by_pllink (const NMConfigData *self, 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); char **nm_config_data_get_groups (const NMConfigData *self); char **nm_config_data_get_keys (const NMConfigData *self, const char *group); |