diff options
| author | Michael Biebl <biebl@debian.org> | 2018-09-23 10:10:27 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2018-09-23 10:10:27 +0200 |
| commit | e126f3e804c35480c4f075777430419d6ece23da (patch) | |
| tree | 5d5821ebcda8cd6ac34d2483bb3354910e508930 /libnm-util/nm-setting.c | |
| parent | c240974325c552cad177c457d6ff04e381fd77a3 (diff) | |
New upstream version 1.12.4 upstream/1.12.4
Diffstat (limited to 'libnm-util/nm-setting.c')
| -rw-r--r-- | libnm-util/nm-setting.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libnm-util/nm-setting.c b/libnm-util/nm-setting.c index 9147dfe1..c74d2d71 100644 --- a/libnm-util/nm-setting.c +++ b/libnm-util/nm-setting.c @@ -270,7 +270,7 @@ _nm_setting_lookup_setting_type_by_quark (GQuark error_quark) return G_TYPE_INVALID; } -int +gint _nm_setting_compare_priority (gconstpointer a, gconstpointer b) { guint32 prio_a, prio_b; @@ -321,7 +321,7 @@ nm_setting_to_hash (NMSetting *setting, NMSettingHashFlags flags) property_specs = g_object_class_list_properties (G_OBJECT_GET_CLASS (setting), &n_property_specs); hash = g_hash_table_new_full (g_str_hash, g_str_equal, - g_free, destroy_gvalue); + (GDestroyNotify) g_free, destroy_gvalue); for (i = 0; i < n_property_specs; i++) { GParamSpec *prop_spec = property_specs[i]; @@ -466,7 +466,7 @@ nm_setting_duplicate (NMSetting *setting) return NM_SETTING (dup); } -static int +static gint find_setting_by_name (gconstpointer a, gconstpointer b) { NMSetting *setting = NM_SETTING (a); @@ -616,7 +616,7 @@ nm_setting_compare (NMSetting *a, { GParamSpec **property_specs; guint n_property_specs; - int same = TRUE; + gint same = TRUE; guint i; g_return_val_if_fail (NM_IS_SETTING (a), FALSE); @@ -1335,8 +1335,8 @@ _nm_setting_verify_deprecated_virtual_iface_name (const char *interface_name, const char *setting_name, const char *setting_property, GQuark error_quark, - int e_invalid_property, - int e_missing_property, + gint e_invalid_property, + gint e_missing_property, GSList *all_settings, GError **error) { |