build: fix several coding style issues

7 files changed, 26 insertions, 27 deletions

diff --git a/.gitignore b/.gitignore
index c0aac51..d8f098c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,7 @@ tags
 .*DS_Store
 .deps
 .libs
+.__autoconf_trace_data
 
 ChangeLog
 INSTALL
@@ -86,4 +87,3 @@ src/mbimcli/mbimcli
 utils/mbim-network
 
 src/mbim-proxy/mbim-proxy
-.__autoconf_trace_data
diff --git a/configure.ac b/configure.ac
index 754b4bc..7d8fa7f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -69,7 +69,7 @@ PKG_CHECK_MODULES(LIBMBIM_GLIB,
                   glib-2.0 >= 2.32
                   gobject-2.0
                   gio-2.0
-		  gio-unix-2.0
+                  gio-unix-2.0
                   gudev-1.0 >= 147)
 AC_SUBST(LIBMBIM_GLIB_CFLAGS)
 AC_SUBST(LIBMBIM_GLIB_LIBS)
diff --git a/src/libmbim-glib/mbim-cid.c b/src/libmbim-glib/mbim-cid.c
index 612cf84..50dc4f1 100644
--- a/src/libmbim-glib/mbim-cid.c
+++ b/src/libmbim-glib/mbim-cid.c
@@ -126,6 +126,7 @@ static const CidConfig cid_ms_host_shutdown_config [MBIM_CID_MS_HOST_SHUTDOWN_LA
     { TRUE,  FALSE, FALSE }, /* MBIM_CID_MS_HOST_SHUTDOWN_NOTIFY */
 };
 
+/* Note: index of the array is CID-1 */
 #define MBIM_CID_PROXY_CONTROL_LAST MBIM_CID_PROXY_CONTROL_CONFIGURATION
 static const CidConfig cid_proxy_control_config [MBIM_CID_PROXY_CONTROL_LAST] = {
     { TRUE,  FALSE, FALSE }, /* MBIM_CID_PROXY_CONTROL_CONFIGURATION */
diff --git a/src/libmbim-glib/mbim-device.c b/src/libmbim-glib/mbim-device.c
index e31ea45..0884938 100644
--- a/src/libmbim-glib/mbim-device.c
+++ b/src/libmbim-glib/mbim-device.c
@@ -113,6 +113,7 @@ struct _MbimDevicePrivate {
     guint16 max_control_transfer;
 };
 
+#define MAX_SPAWN_RETRIES             10
 #define MAX_CONTROL_TRANSFER          4096
 #define MAX_TIME_BETWEEN_FRAGMENTS_MS 1250
 
@@ -813,7 +814,6 @@ typedef struct {
     guint spawn_retries;
 } CreateIoChannelContext;
 
-
 static void
 create_iochannel_context_complete_and_free (CreateIoChannelContext *ctx)
 {
@@ -851,8 +851,8 @@ setup_iochannel (CreateIoChannelContext *ctx)
                                  &inner_error)) {
         g_simple_async_result_take_error (ctx->result, inner_error);
         g_io_channel_shutdown (ctx->self->priv->iochannel, FALSE, NULL);
-	g_io_channel_unref (ctx->self->priv->iochannel);
-	ctx->self->priv->iochannel = NULL;
+        g_io_channel_unref (ctx->self->priv->iochannel);
+        ctx->self->priv->iochannel = NULL;
         g_clear_object (&ctx->self->priv->socket_connection);
         g_clear_object (&ctx->self->priv->socket_client);
         create_iochannel_context_complete_and_free (ctx);
@@ -1172,7 +1172,7 @@ create_iochannel_ready (MbimDevice *self,
 {
     GError *error = NULL;
 
-    if( ! create_iochannel_finish (self, res, &error)) {
+    if (!create_iochannel_finish (self, res, &error)) {
         g_simple_async_result_take_error (ctx->result, error);
         device_open_context_complete_and_free (ctx);
         return;
@@ -1285,7 +1285,6 @@ mbim_device_open (MbimDevice          *self,
                            user_data);
 }
 
-
 /*****************************************************************************/
 /* Close channel */
 
@@ -1301,8 +1300,8 @@ destroy_iochannel (MbimDevice  *self,
 
     if (self->priv->iochannel) {
         g_io_channel_shutdown (self->priv->iochannel, TRUE, &inner_error);
-	g_io_channel_unref (self->priv->iochannel);
-	self->priv->iochannel = NULL;
+        g_io_channel_unref (self->priv->iochannel);
+        self->priv->iochannel = NULL;
     }
 
     /* Failures when closing still make the device to get closed */
@@ -1341,6 +1340,7 @@ mbim_device_close_force (MbimDevice *self,
                          GError **error)
 {
     g_return_val_if_fail (MBIM_IS_DEVICE (self), FALSE);
+
     return destroy_iochannel (self, error);
 }
 
@@ -2038,7 +2038,7 @@ finalize (GObject *object)
         if (self->priv->transactions[i]) {
             g_assert (g_hash_table_size (self->priv->transactions[i]) == 0);
             g_hash_table_unref (self->priv->transactions[i]);
-	    self->priv->transactions[i] = NULL;
+            self->priv->transactions[i] = NULL;
         }
     }
 
diff --git a/src/libmbim-glib/mbim-device.h b/src/libmbim-glib/mbim-device.h
index 0e11001..1e4850d 100644
--- a/src/libmbim-glib/mbim-device.h
+++ b/src/libmbim-glib/mbim-device.h
@@ -52,8 +52,6 @@ typedef struct _MbimDevicePrivate MbimDevicePrivate;
 #define MBIM_DEVICE_SIGNAL_INDICATE_STATUS "device-indicate-status"
 #define MBIM_DEVICE_SIGNAL_ERROR           "device-error"
 
-#define MAX_SPAWN_RETRIES 10
-
 /**
  * MbimDevice:
  *
diff --git a/src/libmbim-glib/mbim-proxy.c b/src/libmbim-glib/mbim-proxy.c
index 04125c1..7e2c07d 100644
--- a/src/libmbim-glib/mbim-proxy.c
+++ b/src/libmbim-glib/mbim-proxy.c
@@ -197,7 +197,7 @@ device_close (MbimProxy *self,
             if (device == device_in_list ||
                 g_str_equal (mbim_device_get_path (device), mbim_device_get_path (device_in_list))) {
                 g_debug ("closing device '%s': no longer used", mbim_device_get_path_display (device));
-                mbim_device_close (device_in_list, 
+                mbim_device_close (device_in_list,
                                    15,
                                    NULL,
                                    (GAsyncReadyCallback) device_close_ready,
@@ -274,7 +274,7 @@ complete_internal_proxy_open (Client *client)
     g_debug ("connection to MBIM device '%s' established", mbim_device_get_path (client->device));
 
     g_assert (client->internal_proxy_open_request != NULL);
-    response = mbim_message_open_done_new (mbim_message_get_transaction_id (client->internal_proxy_open_request), 
+    response = mbim_message_open_done_new (mbim_message_get_transaction_id (client->internal_proxy_open_request),
                                            MBIM_STATUS_ERROR_NONE);
 
     if (!send_message (client, response, &error)) {
@@ -303,7 +303,7 @@ indication_cb (MbimDevice *device,
 
             info = &g_array_index (client->mbim_client_info_array, MbimClientInfo, i);
             /* If service UUID match, forward to the remote client */
-            if (mbim_uuid_cmp(mbim_message_indicate_status_get_service_id (message), &info->uuid)) {
+            if (mbim_uuid_cmp (mbim_message_indicate_status_get_service_id (message), &info->uuid)) {
                 forward_indication = TRUE;
                 break;
             }
@@ -497,9 +497,9 @@ process_internal_proxy_config (Client *client,
         error_status_code = MBIM_STATUS_ERROR_NONE;
     } else
         error_status_code = MBIM_STATUS_ERROR_INVALID_PARAMETERS;
-        
-    response = (MbimMessage *)_mbim_message_allocate (MBIM_MESSAGE_TYPE_COMMAND_DONE, 
-                                                      mbim_message_get_transaction_id(message), 
+
+    response = (MbimMessage *)_mbim_message_allocate (MBIM_MESSAGE_TYPE_COMMAND_DONE,
+                                                      mbim_message_get_transaction_id(message),
                                                       sizeof (struct command_done_message));
     command_done = &(((struct full_message *)(response->data))->message.command_done);
     command_done->fragment_header.total   = GUINT32_TO_LE (1);
@@ -528,7 +528,7 @@ track_uuid (Client *client,
     guint i;
     gboolean exists;
 
-    memcpy (&info.uuid, mbim_message_command_done_get_service_id(message), sizeof(info.uuid));
+    memcpy (&info.uuid, mbim_message_command_done_get_service_id (message), sizeof (info.uuid));
     uuid_display = mbim_uuid_get_printable (&info.uuid);
 
     /* Check if it already exists */
@@ -536,7 +536,7 @@ track_uuid (Client *client,
         MbimClientInfo *existing;
 
         existing = &g_array_index (client->mbim_client_info_array, MbimClientInfo, i);
-        if (mbim_uuid_cmp(&info.uuid, &existing->uuid))
+        if (mbim_uuid_cmp (&info.uuid, &existing->uuid))
             break;
     }
     exists = (i < client->mbim_client_info_array->len);
@@ -544,7 +544,7 @@ track_uuid (Client *client,
     if (track && !exists) {
         g_debug ("MBIM client tracked [%s,%s]",
                  mbim_device_get_path_display (client->device),
-        uuid_display);
+                 uuid_display);
         g_array_append_val (client->mbim_client_info_array, info);
     } else if (!track && exists) {
         g_debug ("MBIM client untracked [%s,%s]",
@@ -572,10 +572,10 @@ device_command_ready (MbimDevice *device,
     response = mbim_device_command_finish (device, res, &error);
     if (!response) {
         g_warning ("sending request to device failed: %s", error->message);
-	if (!mbim_device_is_open(device)) {
-	    g_debug ("device is closed");
-	    connection_close (request->client);
-	}
+        if (!mbim_device_is_open (device)) {
+            g_debug ("device is closed");
+            connection_close (request->client);
+        }
 
         g_error_free (error);
         g_slice_free (Request, request);
diff --git a/src/libmbim-glib/mbim-uuid.c b/src/libmbim-glib/mbim-uuid.c
index 82b7346..fcf88eb 100644
--- a/src/libmbim-glib/mbim-uuid.c
+++ b/src/libmbim-glib/mbim-uuid.c
@@ -222,8 +222,8 @@ static const MbimUuid uuid_ms_host_shutdown = {
 static const MbimUuid uuid_proxy_control = {
     .a = { 0x83, 0x8c, 0xf7, 0xfb },
     .b = { 0x8d, 0x0d },
-    .c = { 0x4d, 0x7f }, 
-    .d = { 0x87, 0x1e }, 
+    .c = { 0x4d, 0x7f },
+    .d = { 0x87, 0x1e },
     .e = { 0xd7, 0x1d , 0xbe, 0xfb, 0xb3, 0x9b }
 };