From cc030b9112d2fd474a64e4356d4bc42b017eff13 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Thu, 22 Oct 2020 15:07:36 +0200
Subject: [PATCH] all/trivial: rename local variable for user_data for
 nm_utils_user_data_unpack()

In almost all cases, the variable of this kind is named "user_data".
Rename it for consistency.
---
 libnm/nm-client.c       | 10 +++++-----
 src/devices/nm-device.c |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/libnm/nm-client.c b/libnm/nm-client.c
index 1c2c2dd792..e2052204cd 100644
--- a/libnm/nm-client.c
+++ b/libnm/nm-client.c
@@ -482,17 +482,17 @@ _nm_client_new_error_nm_not_cached(void)
 }
 
 static void
-_nm_client_dbus_call_simple_cb(GObject *source, GAsyncResult *result, gpointer data)
+_nm_client_dbus_call_simple_cb(GObject *source, GAsyncResult *result, gpointer user_data)
 {
     GAsyncReadyCallback callback;
-    gpointer            user_data;
+    gpointer            callback_user_data;
     gs_unref_object GObject *context_busy_watcher = NULL;
     gpointer                 obfuscated_self_ptr;
     gpointer                 log_call_counter_ptr;
 
-    nm_utils_user_data_unpack(data,
+    nm_utils_user_data_unpack(user_data,
                               &callback,
-                              &user_data,
+                              &callback_user_data,
                               &context_busy_watcher,
                               &obfuscated_self_ptr,
                               &log_call_counter_ptr);
@@ -502,7 +502,7 @@ _nm_client_dbus_call_simple_cb(GObject *source, GAsyncResult *result, gpointer d
                  (guint64) GPOINTER_TO_SIZE(obfuscated_self_ptr),
                  GPOINTER_TO_SIZE(log_call_counter_ptr));
 
-    callback(source, result, user_data);
+    callback(source, result, callback_user_data);
 }
 
 void
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
index 57882382ba..06693b4f70 100644
--- a/src/devices/nm-device.c
+++ b/src/devices/nm-device.c
@@ -7927,13 +7927,13 @@ sriov_vf_config_to_platform(NMDevice *self, NMSriovVF *vf, GError **error)
 }
 
 static void
-sriov_params_cb(GError *error, gpointer data)
+sriov_params_cb(GError *error, gpointer user_data)
 {
     NMDevice *       self;
     NMDevicePrivate *priv;
     nm_auto_freev NMPlatformVF **plat_vfs = NULL;
 
-    nm_utils_user_data_unpack(data, &self, &plat_vfs);
+    nm_utils_user_data_unpack(user_data, &self, &plat_vfs);
 
     if (nm_utils_error_is_cancelled_or_disposing(error))
         return;