e_info: 'resource_id' should be stored as uint32_t

Change-Id: If3494a3b0958fc2a7a7b0218b217ce0587f1c778

diff --git a/src/bin/e_info_client.c b/src/bin/e_info_client.c
index 610be53..969a32a 100644 (file)
--- a/src/bin/e_info_client.c
+++ b/src/bin/e_info_client.c
@@ -105,7 +105,7 @@ typedef struct _E_Fps_Info
 #define VALUE_TYPE_FOR_ZONE "iiiiiib"
 #define VALUE_TYPE_FOR_TOPVWINS "uuisiiiiibbbiibibbiiiusbbii"
 #define VALUE_TYPE_REQUEST_RESLIST "ui"
-#define VALUE_TYPE_REPLY_RESLIST "ssi"
+#define VALUE_TYPE_REPLY_RESLIST "ssu"
 #define VALUE_TYPE_FOR_INPUTDEV "ssiss"
 #define VALUE_TYPE_FOR_PENDING_COMMIT "uiuu"
 #define VALUE_TYPE_FOR_FPS "usiud"
@@ -2270,7 +2270,7 @@ _cb_disp_res_lists_get(const Eldbus_Message *msg)
         char cmd[512] = {0, };
         const char *type;
         const char *item;
-        int id = 0;
+        uint32_t id = 0;
         res = eldbus_message_iter_arguments_get(resource,
                                                 VALUE_TYPE_REPLY_RESLIST,
                                                 &type,
@@ -2283,13 +2283,13 @@ _cb_disp_res_lists_get(const Eldbus_Message *msg)
           }
         if (!strcmp(type, "[client]"))
           {
-             pid = id;
+             pid = (int)id;
              nResource = 0;
              ++nClient;
           }
         else if (!strcmp(type, "[count]"))
           {
-             nResource = id;
+             nResource = (int)id;
              _pname_get(pid, cmd, sizeof(cmd));
 
              printf("%6d   %6d   %4d      %9s\n", nClient, pid, nResource, cmd);
@@ -2323,7 +2323,8 @@ _cb_disp_res_lists_get_detail(const Eldbus_Message *msg)
         const char *type;
         const char *item;
         char cmd[512] = {0, };
-        int id = 0, pid = 0;
+        int pid = 0;
+        uint32_t id = 0;
 
         res = eldbus_message_iter_arguments_get(resource,
                                                 VALUE_TYPE_REPLY_RESLIST,
@@ -2339,7 +2340,7 @@ _cb_disp_res_lists_get_detail(const Eldbus_Message *msg)
         if (!strcmp(type, "[client]"))
           {
              nResource = 0;
-             pid = id;
+             pid = (int)id;
              ++nClient;
              _pname_get(pid, cmd, sizeof(cmd));
              printf("[%2d] pid %d  (%s)\n", nClient, pid, cmd);
@@ -2348,7 +2349,7 @@ _cb_disp_res_lists_get_detail(const Eldbus_Message *msg)
         else if (!strcmp(type, "[resource]"))
           {
              ++nResource;
-             printf("      |----- %s obj@%d\n", item, id);
+             printf("      |----- %s obj@%u\n", item, id);
           }
 
      }

diff --git a/src/bin/e_info_server.c b/src/bin/e_info_server.c
index b6918f0..acd680a 100644 (file)
--- a/src/bin/e_info_server.c
+++ b/src/bin/e_info_server.c
@@ -83,7 +83,7 @@ static Eina_List *module_hook = NULL;
 #define VALUE_TYPE_FOR_ZONE "iiiiiib"
 #define VALUE_TYPE_FOR_TOPVWINS "uuisiiiiibbbiibibbiiiusbbii"
 #define VALUE_TYPE_REQUEST_RESLIST "ui"
-#define VALUE_TYPE_REPLY_RESLIST "ssi"
+#define VALUE_TYPE_REPLY_RESLIST "ssu"
 #define VALUE_TYPE_FOR_INPUTDEV "ssiss"
 #define VALUE_TYPE_FOR_PENDING_COMMIT "uiuu"
 #define VALUE_TYPE_FOR_FPS "usiud"
@@ -1033,14 +1033,14 @@ _msg_clients_res_list_append(Eldbus_Message_Iter *iter, uint32_t mode, int id)
 
         eldbus_message_iter_arguments_append(array_of_res, "("VALUE_TYPE_REPLY_RESLIST")", &struct_of_res);
 
-        eldbus_message_iter_arguments_append(struct_of_res, VALUE_TYPE_REPLY_RESLIST, "[client]", "pid", pid);
+        eldbus_message_iter_arguments_append(struct_of_res, VALUE_TYPE_REPLY_RESLIST, "[client]", "pid", (uint32_t)pid);
         eldbus_message_iter_container_close(array_of_res, struct_of_res);
 
         resurceCnt = 0;
         wl_client_for_each_resource(client, _e_info_server_get_resource, array_of_res);
 
         eldbus_message_iter_arguments_append(array_of_res, "("VALUE_TYPE_REPLY_RESLIST")", &struct_of_res);
-        eldbus_message_iter_arguments_append(struct_of_res, VALUE_TYPE_REPLY_RESLIST, "[count]", "resurceCnt", resurceCnt);
+        eldbus_message_iter_arguments_append(struct_of_res, VALUE_TYPE_REPLY_RESLIST, "[count]", "resurceCnt", (uint32_t)resurceCnt);
         eldbus_message_iter_container_close(array_of_res, struct_of_res);
      }
    eldbus_message_iter_container_close(iter, array_of_res);