xmm6260 rfs cleanup: code style and compilation warnings

1 files changed, 23 insertions, 18 deletions

diff --git a/samsung-ipc/device/xmm6260/xmm6260_ipc.c b/samsung-ipc/device/xmm6260/xmm6260_ipc.c
index 6ee6b6b..cc39b6f 100644
--- a/samsung-ipc/device/xmm6260/xmm6260_ipc.c
+++ b/samsung-ipc/device/xmm6260/xmm6260_ipc.c
@@ -150,7 +150,7 @@ int xmm6260_rfs_recv(struct ipc_client *client, struct ipc_message_info *respons
     unsigned char buf[IPC_MAX_XFER] = {};
     struct rfs_hdr header;
     int header_recv = 0;
-    int count=0;
+    unsigned count=0;
     int rc;
 
     do {
@@ -160,10 +160,11 @@ int xmm6260_rfs_recv(struct ipc_client *client, struct ipc_message_info *respons
             ipc_client_log(client, "Failed to read RFS data.");
             return -1;
         }
+        ipc_client_log(client, "received %d bytes", rc);
 
         // We didn't recieve the header yet
         if (!header_recv) {
-            if (rc < sizeof(struct rfs_hdr)) {
+            if ((unsigned)rc < sizeof(struct rfs_hdr)) {
                 ipc_client_log(client, "Failed to read RFS data.");
                 return -1;
             }
@@ -183,16 +184,23 @@ int xmm6260_rfs_recv(struct ipc_client *client, struct ipc_message_info *respons
             response->length = header.size - sizeof(struct rfs_hdr);
             response->data = NULL;
 
-            ipc_client_log(client, "READ %d bytes, header size says %d", rc, header.size);
-
-            ipc_client_log(client, "crespo_ipc_rfs_client_recv: RECV RFS (id=%d cmd=%d size=%d)!", header.id, header.cmd, header.size);
-            ipc_client_log(client, "crespo_ipc_rfs_client_recv: IPC response (aseq=0x%02x command=%s (0x%04x))",
-                response->mseq, ipc_command_to_str(IPC_COMMAND(response)), IPC_COMMAND(response));
+            ipc_client_log(client, "READ %d bytes, header size says %d",
+                rc, header.size);
+            ipc_client_log(client, "%s: RECV RFS (id=%d cmd=%d size=%d)!",
+                __func__, header.id, header.cmd, header.size);
+            ipc_client_log(client,
+                "%s: IPC response (aseq=0x%02x command=%s (0x%04x))",
+                __func__, response->mseq,
+                ipc_command_to_str(IPC_COMMAND(response)),
+                IPC_COMMAND(response));
 
             if (response->length > 0) {
                 response->data = malloc(response->length);
-                memcpy(response->data, (void *) (buf + sizeof(struct rfs_hdr)), rc - sizeof(struct rfs_hdr));
-                ipc_client_log(client, "writing at offset 0 %d bytes", rc - sizeof(struct rfs_hdr));
+                memcpy(response->data,
+                    (void *) (buf + sizeof(struct rfs_hdr)),
+                    rc - sizeof(struct rfs_hdr));
+                ipc_client_log(client, "writing at offset 0 %d bytes",
+                    rc - sizeof(struct rfs_hdr));
             }
 
             header_recv = 1;
@@ -210,15 +218,10 @@ int xmm6260_rfs_recv(struct ipc_client *client, struct ipc_message_info *respons
 int xmm6260_rfs_send(struct ipc_client *client, struct ipc_message_info *request)
 {
     struct rfs_hdr *header = NULL;
-    void *data = NULL;
+    char *data = NULL;
     int data_length;
     int rc;
 
-    if (request->length < 0) {
-        ipc_client_log(client, "Invalid data length!");
-        return -1;
-    }
-
     data_length = sizeof(struct rfs_hdr) + request->length;
     data = malloc(data_length);
     memset(data, 0, data_length);
@@ -230,9 +233,11 @@ int xmm6260_rfs_send(struct ipc_client *client, struct ipc_message_info *request
 
     memcpy((void *) (data + sizeof(struct rfs_hdr)), request->data, request->length);
 
-    ipc_client_log(client, "crespo_ipc_rfs_client_send: SEND RFS (id=%d cmd=%d size=%d)!", header->id, header->cmd, header->size);
-    ipc_client_log(client, "crespo_ipc_rfs_client_send: IPC request (mseq=0x%02x command=%s (0x%04x))",
-                    request->mseq, ipc_command_to_str(IPC_COMMAND(request)), IPC_COMMAND(request));
+    ipc_client_log(client, "%s: SEND RFS (id=%d cmd=%d size=%d)!",
+        __func__, header->id, header->cmd, header->size);
+    ipc_client_log(client, "%s: IPC request (mseq=0x%02x command=%s (0x%04x))",
+        __func__, request->mseq, ipc_command_to_str(IPC_COMMAND(request)),
+        IPC_COMMAND(request));
 
     rc = client->handlers->write(data, data_length, client->handlers->write_data);
     return rc;