kdbus: svace fix

Change-Id: I8166bd83bcd4b5fbca516daa2f1917437820ea8c
Signed-off-by: sanghyeok.oh <sanghyeok.oh@samsung.com>

diff --git a/gio/gkdbus.c b/gio/gkdbus.c
index 72da995..2b06396 100755 (executable)
--- a/gio/gkdbus.c
+++ b/gio/gkdbus.c
@@ -785,7 +785,7 @@ _g_kdbus_Hello (GKDBusWorker  *worker,
   cmd->pool_size = worker->receive_pool_size;
 
   item = cmd->items;
-  item->size = G_STRUCT_OFFSET (struct kdbus_item, str) + conn_name_size + 1;
+  item->size = (guint64) G_STRUCT_OFFSET (struct kdbus_item, str) + conn_name_size + 1;
   item->type = KDBUS_ITEM_CONN_DESCRIPTION;
   memcpy (item->str, conn_name, conn_name_size+1);
   item = KDBUS_ITEM_NEXT (item);
@@ -895,7 +895,7 @@ _g_kdbus_RequestName (GKDBusWorker        *worker,
   GBusRequestNameReplyFlags status;
   struct kdbus_cmd *cmd;
   guint64 kdbus_flags;
-  gssize len, size;
+  gsize len, size;
   gint ret;
 
   status = G_BUS_REQUEST_NAME_FLAGS_PRIMARY_OWNER;
@@ -945,7 +945,7 @@ _g_kdbus_RequestName (GKDBusWorker        *worker,
   g_kdbus_translate_nameowner_flags (flags, &kdbus_flags);
 
   len = strlen(name) + 1;
-  size = G_STRUCT_OFFSET (struct kdbus_cmd, items) + KDBUS_ITEM_SIZE(len);
+  size = (gulong) G_STRUCT_OFFSET (struct kdbus_cmd, items) + KDBUS_ITEM_SIZE(len);
   cmd = g_alloca0 (size);
   cmd->size = size;
   cmd->items[0].size = KDBUS_ITEM_HEADER_SIZE + len;
@@ -997,7 +997,7 @@ _g_kdbus_ReleaseName (GKDBusWorker  *worker,
 {
   GBusReleaseNameReplyFlags status;
   struct kdbus_cmd *cmd;
-  gssize len, size;
+  gsize len, size;
   gint ret;
 
   status = G_BUS_RELEASE_NAME_FLAGS_RELEASED;
@@ -1030,7 +1030,7 @@ _g_kdbus_ReleaseName (GKDBusWorker  *worker,
     }
 
   len = strlen(name) + 1;
-  size = G_STRUCT_OFFSET (struct kdbus_cmd, items) + KDBUS_ITEM_SIZE(len);
+  size = (gulong) G_STRUCT_OFFSET (struct kdbus_cmd, items) + KDBUS_ITEM_SIZE(len);
   cmd = g_alloca0 (size);
   cmd->size = size;
   cmd->items[0].size = KDBUS_ITEM_HEADER_SIZE + len;
@@ -1200,19 +1200,19 @@ g_kdbus_NameHasOwner_internal (GKDBusWorker  *worker,
 {
   struct kdbus_cmd_info *cmd;
   struct kdbus_info *conn_info;
-  gssize size, len;
+  gsize size, len;
   gint ret;
 
   if (g_dbus_is_unique_name(name))
     {
-       size = G_STRUCT_OFFSET (struct kdbus_cmd_info, items);
+       size = (gulong) G_STRUCT_OFFSET (struct kdbus_cmd_info, items);
        cmd = g_alloca0 (size);
        cmd->id = g_ascii_strtoull (name+3, NULL, 10);
     }
   else
     {
        len = strlen(name) + 1;
-       size = G_STRUCT_OFFSET (struct kdbus_cmd_info, items) + KDBUS_ITEM_SIZE(len);
+       size = (gulong) G_STRUCT_OFFSET (struct kdbus_cmd_info, items) + KDBUS_ITEM_SIZE(len);
        cmd = g_alloca0 (size);
        cmd->items[0].size = KDBUS_ITEM_HEADER_SIZE + len;
        cmd->items[0].type = KDBUS_ITEM_NAME;
@@ -1361,7 +1361,7 @@ _g_kdbus_GetConnInfo (GKDBusWorker  *worker,
   struct kdbus_cmd_info *cmd;
   struct kdbus_info *conn_info;
   struct kdbus_item *item;
-  gssize size, len;
+  gsize size, len;
   gint ret;
 
   creds = g_new0 (GDBusCredentials, 1);
@@ -1386,14 +1386,14 @@ _g_kdbus_GetConnInfo (GKDBusWorker  *worker,
 
   if (g_dbus_is_unique_name(name))
     {
-       size = G_STRUCT_OFFSET (struct kdbus_cmd_info, items);
+       size = (gulong) G_STRUCT_OFFSET (struct kdbus_cmd_info, items);
        cmd = g_alloca0 (size);
        cmd->id = g_ascii_strtoull (name+3, NULL, 10);
     }
   else
     {
        len = strlen(name) + 1;
-       size = G_STRUCT_OFFSET (struct kdbus_cmd_info, items) + KDBUS_ITEM_SIZE(len);
+       size = (gulong) G_STRUCT_OFFSET (struct kdbus_cmd_info, items) + KDBUS_ITEM_SIZE(len);
        cmd = g_alloca0 (size);
        cmd->items[0].size = KDBUS_ITEM_HEADER_SIZE + len;
        cmd->items[0].type = KDBUS_ITEM_NAME;
@@ -1936,14 +1936,14 @@ _g_kdbus_AddMatch (GKDBusWorker  *worker,
   cmd->cookie = match->cookie;
 
   item = cmd->items;
-  item->size = G_STRUCT_OFFSET(struct kdbus_item, data64) + worker->bloom_size;
+  item->size = (guint64) G_STRUCT_OFFSET(struct kdbus_item, data64) + worker->bloom_size;
   item->type = KDBUS_ITEM_BLOOM_MASK;
   memcpy(item->data64, bloom, worker->bloom_size);
   item = KDBUS_ITEM_NEXT(item);
 
   if (src_id != KDBUS_MATCH_ID_ANY)
     {
-      item->size = G_STRUCT_OFFSET (struct kdbus_item, id) + sizeof(src_id);
+      item->size = (guint64) G_STRUCT_OFFSET (struct kdbus_item, id) + sizeof(src_id);
       item->type = KDBUS_ITEM_ID;
       item->id = src_id;
       item = KDBUS_ITEM_NEXT(item);
@@ -1951,7 +1951,7 @@ _g_kdbus_AddMatch (GKDBusWorker  *worker,
 
   if (sender_name)
     {
-      item->size = G_STRUCT_OFFSET (struct kdbus_item, str) + sender_len;
+      item->size = (guint64) G_STRUCT_OFFSET (struct kdbus_item, str) + sender_len;
       item->type = KDBUS_ITEM_NAME;
       memcpy (item->str, sender_name, sender_len);
     }
@@ -2078,7 +2078,7 @@ _g_kdbus_subscribe_name_owner_changed_internal (GKDBusWorker  *worker,
 {
   struct kdbus_item *item;
   struct kdbus_cmd_match *cmd;
-  gssize size, len;
+  gsize size, len;
   gint ret;
   guint64 old_id = 0;
   guint64 new_id = KDBUS_MATCH_ID_ANY;
@@ -2133,8 +2133,8 @@ _g_kdbus_subscribe_name_owner_changed_internal (GKDBusWorker  *worker,
   if (name)
     memcpy(item->name_change.name, name, len);
 
-  item->size = G_STRUCT_OFFSET (struct kdbus_item, name_change) +
-               G_STRUCT_OFFSET (struct kdbus_notify_name_change, name) + len;
+  item->size = (guint64) G_STRUCT_OFFSET (struct kdbus_item, name_change) +
+               (guint64) G_STRUCT_OFFSET (struct kdbus_notify_name_change, name) + len;
   item = KDBUS_ITEM_NEXT(item);
 
   ret = ioctl(worker->fd, KDBUS_CMD_MATCH_ADD, cmd);
@@ -2163,7 +2163,7 @@ _g_kdbus_subscribe_name_acquired (GKDBusWorker  *worker,
   Match *match;
   struct kdbus_item *item;
   struct kdbus_cmd_match *cmd;
-  gssize size, len;
+  gsize size, len;
   gint ret;
 
   if (match_rule[0] == '-')
@@ -2218,8 +2218,8 @@ _g_kdbus_subscribe_name_acquired (GKDBusWorker  *worker,
   if (name)
     memcpy(item->name_change.name, name, len);
 
-  item->size = G_STRUCT_OFFSET (struct kdbus_item, name_change) +
-               G_STRUCT_OFFSET (struct kdbus_notify_name_change, name) + len;
+  item->size = (guint64) G_STRUCT_OFFSET (struct kdbus_item, name_change) +
+               (guint64) G_STRUCT_OFFSET (struct kdbus_notify_name_change, name) + len;
   item = KDBUS_ITEM_NEXT(item);
 
   ret = ioctl(worker->fd, KDBUS_CMD_MATCH_ADD, cmd);
@@ -2258,7 +2258,7 @@ _g_kdbus_subscribe_name_lost (GKDBusWorker  *worker,
   Match *match;
   struct kdbus_item *item;
   struct kdbus_cmd_match *cmd;
-  gssize size, len;
+  gsize size, len;
   gint ret;
 
   if (match_rule[0] == '-')
@@ -2313,8 +2313,8 @@ _g_kdbus_subscribe_name_lost (GKDBusWorker  *worker,
   if (name)
     memcpy(item->name_change.name, name, len);
 
-  item->size = G_STRUCT_OFFSET (struct kdbus_item, name_change) +
-               G_STRUCT_OFFSET(struct kdbus_notify_name_change, name) + len;
+  item->size = (guint64) G_STRUCT_OFFSET (struct kdbus_item, name_change) +
+               (guint64) G_STRUCT_OFFSET(struct kdbus_notify_name_change, name) + len;
   item = KDBUS_ITEM_NEXT(item);
 
   ret = ioctl(worker->fd, KDBUS_CMD_MATCH_ADD, cmd);
@@ -2353,7 +2353,7 @@ _g_kdbus_subscribe_name_owner_changed (GKDBusWorker  *worker,
   Match *match;
   struct kdbus_item *item;
   struct kdbus_cmd_match *cmd;
-  gssize size, len;
+  gsize size, len;
   gint ret;
 
   if (match_rule[0] == '-')
@@ -2404,7 +2404,7 @@ _g_kdbus_subscribe_name_owner_changed (GKDBusWorker  *worker,
       else
         item->id_change.id = KDBUS_MATCH_ID_ANY;
 
-      item->size = G_STRUCT_OFFSET (struct kdbus_item, id_change) +
+      item->size = (guint64) G_STRUCT_OFFSET (struct kdbus_item, id_change) +
                    sizeof (struct kdbus_notify_id_change);
 
       item->type = KDBUS_ITEM_ID_ADD;
@@ -2451,8 +2451,8 @@ _g_kdbus_subscribe_name_owner_changed (GKDBusWorker  *worker,
 
       item->name_change.old_id.id = KDBUS_MATCH_ID_ANY;
       item->name_change.new_id.id = KDBUS_MATCH_ID_ANY;
-      item->size = G_STRUCT_OFFSET (struct kdbus_item, name_change) +
-                   G_STRUCT_OFFSET (struct kdbus_notify_name_change, name) + len;
+      item->size = (guint64) G_STRUCT_OFFSET (struct kdbus_item, name_change) +
+                   (guint64) G_STRUCT_OFFSET (struct kdbus_notify_name_change, name) + len;
 
       if (name)
         memcpy(item->name_change.name, name, len);
@@ -3192,8 +3192,8 @@ g_kdbus_msg_append_bloom (struct kdbus_msg  *msg,
   struct kdbus_item *bloom_item;
   gsize bloom_item_size;
 
-  bloom_item_size = G_STRUCT_OFFSET (struct kdbus_item, bloom_filter) +
-                    G_STRUCT_OFFSET (struct kdbus_bloom_filter, data) +
+  bloom_item_size = (gulong) G_STRUCT_OFFSET (struct kdbus_item, bloom_filter) +
+                    (gulong) G_STRUCT_OFFSET (struct kdbus_bloom_filter, data) +
                     size;
 
   msg->size += (-msg->size) & 7;