summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cli/qmicli-dms.c18
-rw-r--r--cli/qmicli-nas.c18
-rw-r--r--cli/qmicli-wds.c22
-rw-r--r--cli/qmicli.c38
4 files changed, 48 insertions, 48 deletions
diff --git a/cli/qmicli-dms.c b/cli/qmicli-dms.c
index 0659cc0..293b053 100644
--- a/cli/qmicli-dms.c
+++ b/cli/qmicli-dms.c
@@ -304,18 +304,18 @@ qmicli_dms_options_enabled (void)
}
static void
-context_free (Context *ctx)
+context_free (Context *context)
{
- if (!ctx)
+ if (!context)
return;
- if (ctx->cancellable)
- g_object_unref (ctx->cancellable);
- if (ctx->device)
- g_object_unref (ctx->device);
- if (ctx->client)
- g_object_unref (ctx->client);
- g_slice_free (Context, ctx);
+ if (context->cancellable)
+ g_object_unref (context->cancellable);
+ if (context->device)
+ g_object_unref (context->device);
+ if (context->client)
+ g_object_unref (context->client);
+ g_slice_free (Context, context);
}
static void
diff --git a/cli/qmicli-nas.c b/cli/qmicli-nas.c
index 7684dd7..47bbd71 100644
--- a/cli/qmicli-nas.c
+++ b/cli/qmicli-nas.c
@@ -141,18 +141,18 @@ qmicli_nas_options_enabled (void)
}
static void
-context_free (Context *ctx)
+context_free (Context *context)
{
- if (!ctx)
+ if (!context)
return;
- if (ctx->cancellable)
- g_object_unref (ctx->cancellable);
- if (ctx->device)
- g_object_unref (ctx->device);
- if (ctx->client)
- g_object_unref (ctx->client);
- g_slice_free (Context, ctx);
+ if (context->cancellable)
+ g_object_unref (context->cancellable);
+ if (context->device)
+ g_object_unref (context->device);
+ if (context->client)
+ g_object_unref (context->client);
+ g_slice_free (Context, context);
}
static void
diff --git a/cli/qmicli-wds.c b/cli/qmicli-wds.c
index b9ad624..73e287a 100644
--- a/cli/qmicli-wds.c
+++ b/cli/qmicli-wds.c
@@ -137,20 +137,20 @@ qmicli_wds_options_enabled (void)
}
static void
-context_free (Context *ctx)
+context_free (Context *context)
{
- if (!ctx)
+ if (!context)
return;
- if (ctx->client)
- g_object_unref (ctx->client);
- if (ctx->network_started_id)
- g_cancellable_disconnect (ctx->cancellable, ctx->network_started_id);
- if (ctx->packet_status_timeout_id)
- g_source_remove (ctx->packet_status_timeout_id);
- g_object_unref (ctx->cancellable);
- g_object_unref (ctx->device);
- g_slice_free (Context, ctx);
+ if (context->client)
+ g_object_unref (context->client);
+ if (context->network_started_id)
+ g_cancellable_disconnect (context->cancellable, context->network_started_id);
+ if (context->packet_status_timeout_id)
+ g_source_remove (context->packet_status_timeout_id);
+ g_object_unref (context->cancellable);
+ g_object_unref (context->device);
+ g_slice_free (Context, context);
}
static void
diff --git a/cli/qmicli.c b/cli/qmicli.c
index 9a9279d..fd0d6c6 100644
--- a/cli/qmicli.c
+++ b/cli/qmicli.c
@@ -206,12 +206,12 @@ generic_options_enabled (void)
/* Running asynchronously */
static void
-release_client_ready (QmiDevice *device,
+release_client_ready (QmiDevice *dev,
GAsyncResult *res)
{
GError *error = NULL;
- if (!qmi_device_release_client_finish (device, res, &error)) {
+ if (!qmi_device_release_client_finish (dev, res, &error)) {
g_printerr ("error: couldn't release client: %s", error->message);
g_error_free (error);
} else
@@ -259,12 +259,12 @@ qmicli_async_operation_done (gboolean reported_operation_status)
}
static void
-allocate_client_ready (QmiDevice *device,
+allocate_client_ready (QmiDevice *dev,
GAsyncResult *res)
{
GError *error = NULL;
- client = qmi_device_allocate_client_finish (device, res, &error);
+ client = qmi_device_allocate_client_finish (dev, res, &error);
if (!client) {
g_printerr ("error: couldn't create client for the '%s' service: %s\n",
qmi_service_get_string (service),
@@ -275,13 +275,13 @@ allocate_client_ready (QmiDevice *device,
/* Run the service-specific action */
switch (service) {
case QMI_SERVICE_DMS:
- qmicli_dms_run (device, QMI_CLIENT_DMS (client), cancellable);
+ qmicli_dms_run (dev, QMI_CLIENT_DMS (client), cancellable);
return;
case QMI_SERVICE_NAS:
- qmicli_nas_run (device, QMI_CLIENT_NAS (client), cancellable);
+ qmicli_nas_run (dev, QMI_CLIENT_NAS (client), cancellable);
return;
case QMI_SERVICE_WDS:
- qmicli_wds_run (device, QMI_CLIENT_WDS (client), cancellable);
+ qmicli_wds_run (dev, QMI_CLIENT_WDS (client), cancellable);
return;
default:
g_assert_not_reached ();
@@ -289,7 +289,7 @@ allocate_client_ready (QmiDevice *device,
}
static void
-device_allocate_client (QmiDevice *device)
+device_allocate_client (QmiDevice *dev)
{
guint8 cid = QMI_CID_NONE;
@@ -309,7 +309,7 @@ device_allocate_client (QmiDevice *device)
/* As soon as we get the QmiDevice, create a client for the requested
* service */
- qmi_device_allocate_client (device,
+ qmi_device_allocate_client (dev,
service,
cid,
10,
@@ -319,13 +319,13 @@ device_allocate_client (QmiDevice *device)
}
static void
-set_instance_id_ready (QmiDevice *device,
+set_instance_id_ready (QmiDevice *dev,
GAsyncResult *res)
{
GError *error = NULL;
guint16 link_id;
- if (!qmi_device_set_instance_id_finish (device, res, &link_id, &error)) {
+ if (!qmi_device_set_instance_id_finish (dev, res, &link_id, &error)) {
g_printerr ("error: couldn't set instance ID: %s\n",
error->message);
exit (EXIT_FAILURE);
@@ -333,7 +333,7 @@ set_instance_id_ready (QmiDevice *device,
g_print ("[%s] Instance ID set:\n"
"\tLink ID: '%" G_GUINT16_FORMAT "'\n",
- qmi_device_get_path_display (device),
+ qmi_device_get_path_display (dev),
link_id);
/* We're done now */
@@ -341,7 +341,7 @@ set_instance_id_ready (QmiDevice *device,
}
static void
-device_set_instance_id (QmiDevice *device)
+device_set_instance_id (QmiDevice *dev)
{
gint instance_id;
@@ -361,7 +361,7 @@ device_set_instance_id (QmiDevice *device)
}
g_debug ("Setting instance ID '%d'...", instance_id);
- qmi_device_set_instance_id (device,
+ qmi_device_set_instance_id (dev,
(guint8)instance_id,
10,
cancellable,
@@ -370,24 +370,24 @@ device_set_instance_id (QmiDevice *device)
}
static void
-device_open_ready (QmiDevice *device,
+device_open_ready (QmiDevice *dev,
GAsyncResult *res)
{
GError *error = NULL;
- if (!qmi_device_open_finish (device, res, &error)) {
+ if (!qmi_device_open_finish (dev, res, &error)) {
g_printerr ("error: couldn't open the QmiDevice: %s\n",
error->message);
exit (EXIT_FAILURE);
}
g_debug ("QMI Device at '%s' ready",
- qmi_device_get_path_display (device));
+ qmi_device_get_path_display (dev));
if (device_set_instance_id_str)
- device_set_instance_id (device);
+ device_set_instance_id (dev);
else
- device_allocate_client (device);
+ device_allocate_client (dev);
}
static void
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-20 06:47:05 +0000