colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

all/trivial: rename local variable for user_data for nm_utils_user_data_unpack()

Browse Source 
In almost all cases, the variable of this kind is named "user_data".
Rename it for consistency.
This commit is contained in:
Thomas Haller
2020-10-22 15:07:36 +02:00
parent a2ecd073c8
commit cc030b9112
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libnm/nm-client.c
View File

@@ -482,17 +482,17 @@ _nm_client_new_error_nm_not_cached(void)
} }
static 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; GAsyncReadyCallback callback;
gpointer user_data; gpointer callback_user_data;
gs_unref_object GObject *context_busy_watcher = NULL; gs_unref_object GObject *context_busy_watcher = NULL;
gpointer obfuscated_self_ptr; gpointer obfuscated_self_ptr;
gpointer log_call_counter_ptr; gpointer log_call_counter_ptr;
nm_utils_user_data_unpack(data, nm_utils_user_data_unpack(user_data,
&callback, &callback,
&user_data, &callback_user_data,
&context_busy_watcher, &context_busy_watcher,
&obfuscated_self_ptr, &obfuscated_self_ptr,
&log_call_counter_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), (guint64) GPOINTER_TO_SIZE(obfuscated_self_ptr),
GPOINTER_TO_SIZE(log_call_counter_ptr)); GPOINTER_TO_SIZE(log_call_counter_ptr));
callback(source, result, user_data); callback(source, result, callback_user_data);
} }
void void

4
src/devices/nm-device.c
View File

@@ -7927,13 +7927,13 @@ sriov_vf_config_to_platform(NMDevice *self, NMSriovVF *vf, GError **error)
} }
static void static void
sriov_params_cb(GError *error, gpointer data) sriov_params_cb(GError *error, gpointer user_data)
{ {
NMDevice * self; NMDevice * self;
NMDevicePrivate *priv; NMDevicePrivate *priv;
nm_auto_freev NMPlatformVF **plat_vfs = NULL; 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)) if (nm_utils_error_is_cancelled_or_disposing(error))
return; return;