source: remove build warning

change format specifier for 'size_t': %d -> %zu, %x -> %zx
remove -Wint-to-pointer-cast, -Wpointer-to-int-cast
apply indentation to 'if' statement

Change-Id: Id58a213d6ce8a8b43d19c2789327ec7b2716ab93
Signed-off-by: Jinhyung Jo <jinhyung.jo@samsung.com>

diff --git a/src/default_plugin_appcmd.c b/src/default_plugin_appcmd.c
index 2302386..8ffb4e3 100644 (file)
--- a/src/default_plugin_appcmd.c
+++ b/src/default_plugin_appcmd.c
@@ -68,7 +68,7 @@ static int appcmd_install_gen_shellcmd(appcmd_info* p_info) {
     int len = sizeof(p_info->shell_cmd);
 
     if (p_info->args_cnt != 5) {
-        D("failed to parse appcmd.(cnt=%d)\n", p_info->args_cnt);
+        D("failed to parse appcmd.(cnt=%zu)\n", p_info->args_cnt);
         return -1;
     }
 
@@ -101,7 +101,7 @@ static int appcmd_uninstall_gen_shellcmd(appcmd_info* p_info) {
     int len = sizeof(p_info->shell_cmd);
 
     if (p_info->args_cnt != 2) {
-        D("failed to parse appcmd.(cnt=%d)\n", p_info->args_cnt);
+        D("failed to parse appcmd.(cnt=%zu)\n", p_info->args_cnt);
         return -1;
     }
 
@@ -120,7 +120,7 @@ static int appcmd_runapp_gen_shellcmd(appcmd_info* p_info) {
     int len = sizeof(p_info->shell_cmd);
 
     if (p_info->args_cnt != 2) {
-        D("failed to parse appcmd.(cnt=%d)\n", p_info->args_cnt);
+        D("failed to parse appcmd.(cnt=%zu)\n", p_info->args_cnt);
         return -1;
     }
 
@@ -150,7 +150,7 @@ static int appcmd_rununittestapp_gen_shellcmd(appcmd_info* p_info) {
     p_service = strtok_r(p_info->raw_command, ":", &ptr);
     p_appid = strtok_r(NULL, ":", &ptr);
     if (p_service == NULL || p_appid == NULL) {
-        D("failed to parse appcmd.(cnt=%d)\n", p_info->args_cnt);
+        D("failed to parse appcmd.(cnt=%zu)\n", p_info->args_cnt);
         return -1;
     }
 
@@ -175,7 +175,7 @@ static int appcmd_killapp_gen_shellcmd(appcmd_info* p_info) {
     int len = sizeof(p_info->shell_cmd);
 
     if (p_info->args_cnt != 2) {
-        D("failed to parse appcmd.(cnt=%d)\n", p_info->args_cnt);
+        D("failed to parse appcmd.(cnt=%zu)\n", p_info->args_cnt);
         return -1;
     }
 
@@ -194,7 +194,7 @@ static int appcmd_packagelist_gen_shellcmd(appcmd_info* p_info) {
     int len = sizeof(p_info->shell_cmd);
 
     if (p_info->args_cnt != 2) {
-        D("failed to parse appcmd.(cnt=%d)\n", p_info->args_cnt);
+        D("failed to parse appcmd.(cnt=%zu)\n", p_info->args_cnt);
         return -1;
     }
 
@@ -213,7 +213,7 @@ static int appcmd_debugwebapp_gen_shellcmd(appcmd_info* p_info) {
     int len = sizeof(p_info->shell_cmd);
 
     if (p_info->args_cnt != 2) {
-        D("failed to parse appcmd.(cnt=%d)\n", p_info->args_cnt);
+        D("failed to parse appcmd.(cnt=%zu)\n", p_info->args_cnt);
         return -1;
     }
 
@@ -236,7 +236,7 @@ static int appcmd_debugnativeapp_gen_shellcmd(appcmd_info* p_info) {
     int len = sizeof(p_info->shell_cmd);
 
     if (p_info->args_cnt != 5) {
-        D("failed to parse appcmd.(cnt=%d)\n", p_info->args_cnt);
+        D("failed to parse appcmd.(cnt=%zu)\n", p_info->args_cnt);
         return -1;
     }
 
@@ -264,7 +264,7 @@ static int appcmd_appinfo_gen_shellcmd(appcmd_info* p_info) {
     int len = sizeof(p_info->shell_cmd);
 
     if (p_info->args_cnt != 2) {
-        D("failed to parse appcmd.(cnt=%d)\n", p_info->args_cnt);
+        D("failed to parse appcmd.(cnt=%zu)\n", p_info->args_cnt);
         return -1;
     }
 
@@ -571,7 +571,7 @@ static void run_appcmd_packageinfo(appcmd_info* p_info) {
     p_info->exitcode = -1;
 
     if (p_info->args_cnt != 3) {
-        D("failed to parse appcmd.(cnt=%d)\n", p_info->args_cnt);
+        D("failed to parse appcmd.(cnt=%zu)\n", p_info->args_cnt);
         return;
     }
 
@@ -596,7 +596,7 @@ static int appcmd_packageinfo_gen_shellcmd(appcmd_info* p_info) {
     int len = sizeof(p_info->shell_cmd);
 
     if (p_info->args_cnt != 2) {
-        D("failed to parse appcmd.(cnt=%d)\n", p_info->args_cnt);
+        D("failed to parse appcmd.(cnt=%zu)\n", p_info->args_cnt);
         return -1;
     }
 
@@ -714,7 +714,7 @@ int appcmd_service( parameters* in, int out_fd ) {
     /* appcmd parameter data map
      * "service name:arg1:arg2:...:argN" */
     info.args_cnt = tokenize(command, ":", info.args, MAX_TOKENS);
-    D("args_cnt=%d\n", info.args_cnt);
+    D("args_cnt=%zu\n", info.args_cnt);
     if (info.args_cnt < 1) {
         D("failed to parse appcmd for install. (%s)\n", command);
         info.exitcode = -1;

diff --git a/src/sdb.c b/src/sdb.c
index fd9114c..a83c3f7 100644 (file)
--- a/src/sdb.c
+++ b/src/sdb.c
@@ -791,7 +791,7 @@ static void update_version(atransport *t, int version, size_t payload)
 #endif
     t->protocol_version = min(version, A_VERSION);
     t->max_payload = min(payload, max_payload);
-    D("update transport version. version=%x, max_payload=%d\n", t->protocol_version, t->max_payload);
+    D("update transport version. version=%x, max_payload=%zu\n", t->protocol_version, t->max_payload);
 }
 
 void handle_packet(apacket *p, atransport *t)
@@ -1398,7 +1398,7 @@ static int sdbd_set_groups(const char *name, int gid, struct group_info default_
     D("group list : ngroups = %d\n", ngroups);
     group_ids = malloc((ngroups + default_groups_size) * sizeof(gid_t));
     if (group_ids == NULL) {
-        D("failed to allocate group_ids(%d)\n", (ngroups + default_groups_size) * sizeof(gid_t));
+        D("failed to allocate group_ids(%zu)\n", (ngroups + default_groups_size) * sizeof(gid_t));
         return -1;
     }
     if (getgrouplist(name, gid, group_ids, &ngroups) == -1) {

diff --git a/src/services.c b/src/services.c
index c12a8d7..6c9d1d6 100644 (file)
--- a/src/services.c
+++ b/src/services.c
@@ -578,7 +578,7 @@ int create_userprocess(const char *cmd, pid_t *pid, char * const argv[], char *
 
 static void subproc_waiter_service(int fd, void *cookie)
 {
-    pid_t pid = (pid_t)cookie;
+    pid_t pid = (pid_t)((intptr_t)cookie);
 
     D("entered. fd=%d of pid=%d\n", fd, pid);
     for (;;) {
@@ -820,7 +820,7 @@ static int create_subproc_thread(const char *name, int lines, int columns)
     sti = malloc(sizeof(stinfo));
     if(sti == 0) fatal("cannot allocate stinfo");
     sti->func = subproc_waiter_service;
-    sti->cookie = (void*)pid;
+    sti->cookie = (void*)((intptr_t)pid);
     sti->fd = ret_fd;
 
     if(sdb_thread_create( &t, service_bootstrap_func, sti)){
@@ -866,7 +866,7 @@ static int create_sync_subprocess(void (*func)(int, void *), void* cookie) {
     sti = malloc(sizeof(stinfo));
     if(sti == 0) fatal("cannot allocate stinfo");
     sti->func = subproc_waiter_service;
-    sti->cookie = (void*)pid;
+    sti->cookie = (void*)((intptr_t)pid);
     sti->fd = s[0];
 
     if(sdb_thread_create( &t, service_bootstrap_func, sti)){

diff --git a/src/sockets.c b/src/sockets.c
index f27affa..b81d6a3 100644 (file)
--- a/src/sockets.c
+++ b/src/sockets.c
@@ -335,7 +335,7 @@ static void local_socket_event_func(int fd, unsigned ev, void *_s)
 
         while(avail > 0) {
             r = sdb_read(fd, x, avail);
-            D("LS(%d): post sdb_read(fd=%d,...) r=%d (errno=%d) avail=%d\n", s->id, s->fd, r, r<0?errno:0, avail);
+            D("LS(%d): post sdb_read(fd=%d,...) r=%d (errno=%d) avail=%zu\n", s->id, s->fd, r, r<0?errno:0, avail);
             if(r > 0 && r <= avail) {
                 avail -= r;
                 x += r;

diff --git a/src/transport.c b/src/transport.c
index 152a22a..855c02d 100644 (file)
--- a/src/transport.c
+++ b/src/transport.c
@@ -670,8 +670,8 @@ atransport *acquire_one_transport(int state, transport_type ttype, const char* s
     sdb_mutex_lock(&transport_lock);
     for (t = transport_list.next; t != &transport_list; t = t->next) {
         if (t->connection_state == CS_NOPERM) {
-        if (error_out)
-            *error_out = "insufficient permissions for device";
+            if (error_out)
+                *error_out = "insufficient permissions for device";
             continue;
         }
 
@@ -875,7 +875,7 @@ int readx(int fd, void *ptr, size_t len)
 #if SDB_TRACE
     size_t  len0 = len;
 #endif
-    D("readx: fd=%d wanted=%d\n", fd, len);
+    D("readx: fd=%d wanted=%zu\n", fd, len);
     while(len > 0) {
         r = sdb_read(fd, p, len);
         if(r > 0 && r <= len) {
@@ -894,7 +894,7 @@ int readx(int fd, void *ptr, size_t len)
     }
 
 #if SDB_TRACE
-    D("readx: fd=%d wanted=%d got=%d\n", fd, len0, len0 - len);
+    D("readx: fd=%d wanted=%zu got=%zu\n", fd, len0, len0 - len);
     dump_hex( ptr, len0 );
 #endif
     return 0;
@@ -906,7 +906,7 @@ int writex(int fd, const void *ptr, size_t len)
     int r;
 
 #if SDB_TRACE
-    D("writex: fd=%d len=%d: ", fd, len);
+    D("writex: fd=%d len=%zu: ", fd, len);
     dump_hex( ptr, len );
 #endif
     while(len > 0) {
@@ -936,7 +936,7 @@ int check_header(apacket *p, atransport *t)
     }
 
     if(p->msg.data_length > t->max_payload) {
-        D("check_header(): %d > transport->max_payload(%d)\n", p->msg.data_length, t->max_payload);
+        D("check_header(): %d > transport->max_payload(%zu)\n", p->msg.data_length, t->max_payload);
         return -1;
     }
 

diff --git a/src/transport_local.c b/src/transport_local.c
index 01f5c6c..d1b569e 100644 (file)
--- a/src/transport_local.c
+++ b/src/transport_local.c
@@ -146,7 +146,7 @@ static void *server_socket_thread(void * arg)
     int serverfd, fd;
     struct sockaddr_in addr;
     socklen_t alen;
-    int port = (int)arg;
+    int port = (intptr_t)arg;
 
     D("transport: server_socket_thread() starting\n");
     serverfd = -1;
@@ -469,7 +469,7 @@ static void* notify_sdbd_startup_thread(void* ptr) {
             snprintf(request, sizeof request, "host:connect:%s:%d", guest_ip, DEFAULT_SDB_LOCAL_TRANSPORT_PORT);
         }
         D("[%s:%d] request:%s \n", __FUNCTION__, __LINE__, request);
-        snprintf(buffer, sizeof buffer, "%04x%s", strlen(request), request );
+        snprintf(buffer, sizeof buffer, "%04zx%s", strlen(request), request );
 
         if (send_msg_to_localhost_from_guest(host_ip, DEFAULT_SDB_PORT, buffer, 0) <0) {
             D("could not send sdbd noti request. it might sdb server has not been started yet.\n");
@@ -501,7 +501,7 @@ void local_init(int port)
 
     D("transport: local %s init\n", HOST ? "client" : "server");
 
-    if(sdb_thread_create(&thr, func, (void *)port)) {
+    if(sdb_thread_create(&thr, func, (void *)((intptr_t)port))) {
         fatal_errno("cannot create local socket %s thread",
                     HOST ? "client" : "server");
     }

diff --git a/src/usb_funcfs_client.c b/src/usb_funcfs_client.c
index 241d368..3ca92a3 100644 (file)
--- a/src/usb_funcfs_client.c
+++ b/src/usb_funcfs_client.c
@@ -554,7 +554,7 @@ int ffs_usb_read(usb_handle *h, void *data, size_t len)
 {
     int n;
 
-    D("%d: about to read (fd=%d, len=%d)\n", getpid(), h->bulk_out, len);
+    D("%d: about to read (fd=%d, len=%zu)\n", getpid(), h->bulk_out, len);
     n = bulk_read(h->bulk_out, data, len);
     if(n != len) {
         D("ERROR: fd = %d, n = %d, errno = %d\n",

diff --git a/src/usb_linux_client.c b/src/usb_linux_client.c
index ecea71a..ea9d7e6 100644 (file)
--- a/src/usb_linux_client.c
+++ b/src/usb_linux_client.c
@@ -98,7 +98,7 @@ int linux_usb_write(usb_handle *h, const void *data, int len)
 
 int linux_usb_read(usb_handle *h, void *data, size_t len)
 {
-      D("about to read (fd=%d, len=%d)\n", h->fd, len);
+      D("about to read (fd=%d, len=%zu)\n", h->fd, len);
         while (len > 0) {
             /* The sdb_read does not support read larger than 4096 bytes at once.
                Read 4096 byte block repeatedly when reading data is larger than 4096 bytes. */