summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libnm-core/nm-setting-sriov.c2
-rw-r--r--shared/nm-test-utils-impl.c2
-rw-r--r--src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c4
3 files changed, 4 insertions, 4 deletions
diff --git a/libnm-core/nm-setting-sriov.c b/libnm-core/nm-setting-sriov.c
index a679a0bedb..3c52dc6cc8 100644
--- a/libnm-core/nm-setting-sriov.c
+++ b/libnm-core/nm-setting-sriov.c
@@ -856,7 +856,7 @@ nm_setting_sriov_get_autoprobe_drivers (NMSettingSriov *setting)
return setting->autoprobe_drivers;
}
-static gint
+static int
vf_index_compare (gconstpointer a, gconstpointer b)
{
NMSriovVF *vf_a = *(NMSriovVF **) a;
diff --git a/shared/nm-test-utils-impl.c b/shared/nm-test-utils-impl.c
index 0ef6591f32..ce7cc8d179 100644
--- a/shared/nm-test-utils-impl.c
+++ b/shared/nm-test-utils-impl.c
@@ -454,7 +454,7 @@ _context_object_new_do_cb (GObject *source_object,
static GObject *
_context_object_new_do (GType gtype,
gboolean sync,
- const gchar *first_property_name,
+ const char *first_property_name,
va_list var_args)
{
gs_free_error GError *error = NULL;
diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
index 2b9d5fd528..6b1f169563 100644
--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
+++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
@@ -431,8 +431,8 @@ make_connection_setting (const char *file,
(int) svGetValueInt64 (ifcfg, "AUTOCONNECT_RETRIES", 10,
-1, G_MAXINT32, -1),
NM_SETTING_CONNECTION_MULTI_CONNECT,
- (gint) svGetValueInt64 (ifcfg, "MULTI_CONNECT", 10,
- G_MININT32, G_MAXINT32, NM_CONNECTION_MULTI_CONNECT_DEFAULT),
+ (int) svGetValueInt64 (ifcfg, "MULTI_CONNECT", 10,
+ G_MININT32, G_MAXINT32, NM_CONNECTION_MULTI_CONNECT_DEFAULT),
NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES,
svGetValueBoolean (ifcfg, "AUTOCONNECT_SLAVES", NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES_DEFAULT),
NM_SETTING_CONNECTION_LLDP, lldp,