e_info: modify type cast for compatibility with 64bit

Change-Id: Ie8246a08411235f73c14a557e37239bdd5bfadaf

diff --git a/src/bin/debug/e_info_client.c b/src/bin/debug/e_info_client.c
index 41c1285696f246d2e3ee7f030954a3b853e53b58..050d2699d3b2e659942d405a9b9bc873206636b9 100644 (file)
--- a/src/bin/debug/e_info_client.c
+++ b/src/bin/debug/e_info_client.c
@@ -44,7 +44,7 @@ typedef struct _E_Info_Client
 
 typedef struct _E_Zone_Info
 {
-   uint32_t ptr;
+   uintptr_t ptr;
    int id;
    int display_state;
    int x, y, w, h;
@@ -56,7 +56,7 @@ typedef struct _E_Zone_Info
 typedef struct _E_Desk_Info
 {
    int zone_id;
-   uint32_t ptr;
+   uintptr_t ptr;
    int id_x, id_y;
    int x, y, w, h;
    Eina_Bool is_current;
@@ -66,7 +66,7 @@ typedef struct _E_Desk_Area_Info
 {
    int zone_id;
    int desk_id_x, desk_id_y;
-   uint32_t ptr;
+   uintptr_t ptr;
    int id;
    Eina_Stringshare *name;
    int layer;
@@ -125,9 +125,9 @@ typedef struct _E_Fps_Info
    double fps;
 } E_Fps_Info;
 
-#define VALUE_TYPE_FOR_ZONE "uiiiiiibii"
-#define VALUE_TYPE_FOR_DESK "iuiiiiiib"
-#define VALUE_TYPE_FOR_DESK_AREA "iiiuisiiiiib"
+#define VALUE_TYPE_FOR_ZONE "tiiiiiibii"
+#define VALUE_TYPE_FOR_DESK "itiiiiiib"
+#define VALUE_TYPE_FOR_DESK_AREA "iiitisiiiiib"
 #define VALUE_TYPE_FOR_TOPVWINS "uuisiiiiibbbiibibbiiiusbbiiiiib"
 #define VALUE_TYPE_REQUEST_RESLIST "ui"
 #define VALUE_TYPE_REPLY_RESLIST "ssu"
@@ -411,7 +411,7 @@ _e_get_windows(int mode, char *value)
 }
 
 static E_Zone_Info *
-_e_zone_info_new(uint32_t ptr, int id, int display_state, int x, int y, int w, int h, Eina_Bool is_current, int angle_cur, int angle_active)
+_e_zone_info_new(uintptr_t ptr, int id, int display_state, int x, int y, int w, int h, Eina_Bool is_current, int angle_cur, int angle_active)
 {
    E_Zone_Info *zone_info = NULL;
 
@@ -441,7 +441,7 @@ _e_zone_info_make_array(Eldbus_Message_Iter *zone_array)
    while (eldbus_message_iter_get_and_next(zone_array, 'r', &zone))
      {
         E_Zone_Info *zone_info = NULL;
-        uint32_t ptr;
+        uint64_t ptr;
         int id;
         int display_state;
                int x, y, w, h;
@@ -456,14 +456,14 @@ _e_zone_info_make_array(Eldbus_Message_Iter *zone_array)
              continue;
           }
 
-        zone_info = _e_zone_info_new(ptr, id, display_state, x, y, w, h, is_current, angle_cur, angle_active);
+        zone_info = _e_zone_info_new((uintptr_t) ptr, id, display_state, x, y, w, h, is_current, angle_cur, angle_active);
         e_info_client.zone_list = eina_list_append(e_info_client.zone_list, zone_info);
      }
 
 }
 
 static E_Desk_Info *
-_e_desk_info_new(int zone_id, uint32_t ptr, int id_x, int id_y, int x, int y, int w, int h, Eina_Bool is_current)
+_e_desk_info_new(int zone_id, uintptr_t ptr, int id_x, int id_y, int x, int y, int w, int h, Eina_Bool is_current)
 {
    E_Desk_Info *desk_info = NULL;
 
@@ -493,7 +493,7 @@ _e_desk_info_make_array(Eldbus_Message_Iter *desk_array)
      {
         E_Desk_Info *desk_info = NULL;
         int zone_id;
-        uint32_t ptr;
+        uint64_t ptr;
         int id_x, id_y;
         int x, y, w, h;
         Eina_Bool is_current;
@@ -505,7 +505,7 @@ _e_desk_info_make_array(Eldbus_Message_Iter *desk_array)
              continue;
           }
 
-        desk_info = _e_desk_info_new(zone_id, ptr, id_x, id_y, x, y, w, h, is_current);
+        desk_info = _e_desk_info_new(zone_id, (uintptr_t) ptr, id_x, id_y, x, y, w, h, is_current);
         e_info_client.desk_list = eina_list_append(e_info_client.desk_list, desk_info);
      }
 }
@@ -523,7 +523,7 @@ _e_desk_area_info_del(E_Desk_Area_Info *desk_area_info)
 }
 
 static E_Desk_Area_Info *
-_e_desk_area_info_new(int zone_id, int desk_id_x, int desk_id_y, uint32_t ptr, int id, const char *name, int layer, int x, int y, int w, int h, Eina_Bool is_base)
+_e_desk_area_info_new(int zone_id, int desk_id_x, int desk_id_y, uintptr_t ptr, int id, const char *name, int layer, int x, int y, int w, int h, Eina_Bool is_base)
 {
    E_Desk_Area_Info *desk_area_info = NULL;
 
@@ -556,7 +556,7 @@ _e_desk_area_info_make_array(Eldbus_Message_Iter *desk_area_array)
      {
         E_Desk_Area_Info *desk_area_info = NULL;
         int zone_id, desk_id_x, desk_id_y;
-        uint32_t ptr;
+        uint64_t ptr;
         int id;
         const char *name;
         int layer;
@@ -570,7 +570,7 @@ _e_desk_area_info_make_array(Eldbus_Message_Iter *desk_area_array)
              continue;
           }
 
-        desk_area_info = _e_desk_area_info_new(zone_id, desk_id_x, desk_id_y, ptr, id, name, layer, x, y, w, h, is_base);
+        desk_area_info = _e_desk_area_info_new(zone_id, desk_id_x, desk_id_y, (uintptr_t) ptr, id, name, layer, x, y, w, h, is_base);
         e_info_client.desk_area_list = eina_list_append(e_info_client.desk_area_list, desk_area_info);
      }
 }
@@ -5629,7 +5629,7 @@ _e_info_client_proc_client_container_info(int argc, char **argv)
         printf("\n====================================================================================================================================\n");
         printf("Zone[%d] Info %s\n", zone_info->id, zone_info->is_current ? "(current)" : "");
         printf("------------------------------------------------------------------------------------------------------------------------------------\n");
-        printf("Zone[%d] ptr : 0x%08d\n", zone_info->id, zone_info->ptr);
+        printf("Zone[%d] ptr : %p\n", zone_info->id, (void *)zone_info->ptr);
         printf("Geometry : %d,%d,%dx%d\n", zone_info->x, zone_info->y, zone_info->w, zone_info->h);
         if (zone_info->display_state == E_ZONE_DISPLAY_STATE_OFF)
           printf("Display State: %s\n", "Off");
@@ -5647,7 +5647,7 @@ _e_info_client_proc_client_container_info(int argc, char **argv)
             if (desk_info->zone_id != zone_info->id) continue;
 
              printf("Desk id : %d, %d\n", desk_info->id_x, desk_info->id_y);
-             printf("Desk ptr : 0x%08x\n", desk_info->ptr);
+             printf("Desk ptr : %p\n", (void *)desk_info->ptr);
              printf("Desk Geometry : %d, %d, %dx%d\n", desk_info->x, desk_info->y, desk_info->w, desk_info->h);
              printf("is Current : %s\n", desk_info->is_current? "current" : "no");
              printf("------------------------------------------------------------------------------------------------------------------------------------\n");
@@ -5662,7 +5662,7 @@ _e_info_client_proc_client_container_info(int argc, char **argv)
                   printf("Desk Areas in Desk[%d][%d]\n", desk_area_info->desk_id_x, desk_area_info->desk_id_y);
                   printf("-----------------------------------------------[ Desk Areas ]-------------------------------------------------------------------------\n");
                   printf("Desk Area id : %d\n", desk_area_info->id);
-                  printf("Desk Area ptr : 0x%08x\n", desk_area_info->ptr);
+                  printf("Desk Area ptr : %p\n", (void *)desk_area_info->ptr);
                   printf("Desk Area name : %s\n", desk_area_info->name);
                   printf("Desk Area Geometry : %d, %d, %dx%d\n", desk_area_info->x, desk_area_info->y, desk_area_info->w, desk_area_info->h);
                   printf("Desk Area layer : %d\n", desk_area_info->layer);

diff --git a/src/bin/debug/e_info_server.c b/src/bin/debug/e_info_server.c
index bfb283b491f25e95e8eef92e74562319573999e8..bfb3c9620f34b7c09e54c5f04b0c374ef5c6f5ca 100644 (file)
--- a/src/bin/debug/e_info_server.c
+++ b/src/bin/debug/e_info_server.c
@@ -133,9 +133,9 @@ static Eina_List *module_hook = NULL;
    str_r -= str_l; \
 } while(0)
 
-#define VALUE_TYPE_FOR_ZONE "uiiiiiibii"
-#define VALUE_TYPE_FOR_DESK "iuiiiiiib"
-#define VALUE_TYPE_FOR_DESK_AREA "iiiuisiiiiib"
+#define VALUE_TYPE_FOR_ZONE "tiiiiiibii"
+#define VALUE_TYPE_FOR_DESK "itiiiiiib"
+#define VALUE_TYPE_FOR_DESK_AREA "iiitisiiiiib"
 #define VALUE_TYPE_FOR_TOPVWINS "uuisiiiiibbbiibibbiiiusbbiiiiib"
 #define VALUE_TYPE_REQUEST_RESLIST "ui"
 #define VALUE_TYPE_REPLY_RESLIST "ssu"
@@ -276,6 +276,7 @@ _e_info_server_cb_zone_info_get(const Eldbus_Service_Interface *iface EINA_UNUSE
    Eina_Bool is_current_zone = EINA_FALSE;
    int angle_cur = 0;
    int angle_active = 0;
+   uintptr_t zone_ptr;
 
    eldbus_message_iter_arguments_append(iter, "("VALUE_TYPE_FOR_ZONE")", &array_of_zone);
 
@@ -283,6 +284,7 @@ _e_info_server_cb_zone_info_get(const Eldbus_Service_Interface *iface EINA_UNUSE
    comp_zone_list = e_comp_zone_list_get();
    EINA_LIST_FOREACH(comp_zone_list, l, zone)
      {
+        zone_ptr = (uintptr_t) zone;
         Eldbus_Message_Iter *struct_of_zone;
         zone_id = zone->id;
         disp_state = e_zone_display_state_get(zone);
@@ -295,7 +297,7 @@ _e_info_server_cb_zone_info_get(const Eldbus_Service_Interface *iface EINA_UNUSE
         angle_active = zone->rot.act;
 
         eldbus_message_iter_arguments_append(array_of_zone, "("VALUE_TYPE_FOR_ZONE")", &struct_of_zone);
-        eldbus_message_iter_arguments_append(struct_of_zone, VALUE_TYPE_FOR_ZONE, (uint32_t) zone, zone_id, disp_state, zone->x, zone->y, zone->w, zone->h, is_current_zone, angle_cur, angle_active);
+        eldbus_message_iter_arguments_append(struct_of_zone, VALUE_TYPE_FOR_ZONE, (uint64_t) zone_ptr, zone_id, disp_state, zone->x, zone->y, zone->w, zone->h, is_current_zone, angle_cur, angle_active);
 
         eldbus_message_iter_container_close(array_of_zone, struct_of_zone);
      }
@@ -317,6 +319,7 @@ _e_info_server_cb_desk_info_get(const Eldbus_Service_Interface *iface EINA_UNUSE
    E_Desk *desk, *current_desk;
    int zone_id;
    int i, n;
+   uintptr_t desk_ptr;
 
    eldbus_message_iter_arguments_append(iter, "("VALUE_TYPE_FOR_DESK")", &array_of_desk);
 
@@ -331,10 +334,11 @@ _e_info_server_cb_desk_info_get(const Eldbus_Service_Interface *iface EINA_UNUSE
           {
              Eldbus_Message_Iter *struct_of_desk;
              desk = zone->desks[i];
+             desk_ptr = (uintptr_t) desk;
 
              eldbus_message_iter_arguments_append(array_of_desk, "("VALUE_TYPE_FOR_DESK")", &struct_of_desk);
              eldbus_message_iter_arguments_append(struct_of_desk, VALUE_TYPE_FOR_DESK,
-                                                  zone_id, (uint32_t) desk, desk->x, desk->y, desk->geom.x, desk->geom.y, desk->geom.w, desk->geom.h,
+                                                  zone_id, (uint64_t) desk_ptr, desk->x, desk->y, desk->geom.x, desk->geom.y, desk->geom.w, desk->geom.h,
                                                   desk == current_desk ? EINA_TRUE : EINA_FALSE);
 
              eldbus_message_iter_container_close(array_of_desk, struct_of_desk);
@@ -360,6 +364,7 @@ _e_info_server_cb_desk_area_info_get(const Eldbus_Service_Interface *iface EINA_
    int zone_id ;
    int desk_id_x, desk_id_y;
    int i, layer, desk_count;
+   uintptr_t desk_area_ptr;
 
    eldbus_message_iter_arguments_append(iter, "("VALUE_TYPE_FOR_DESK_AREA")", &array_of_desk_area);
 
@@ -380,10 +385,11 @@ _e_info_server_cb_desk_area_info_get(const Eldbus_Service_Interface *iface EINA_
                   EINA_LIST_FOREACH(desk->desk_area.list[layer], dal, eda)
                     {
                        Eldbus_Message_Iter *struct_of_desk_area;
+                       desk_area_ptr = (uintptr_t) eda;
 
                        eldbus_message_iter_arguments_append(array_of_desk_area, "("VALUE_TYPE_FOR_DESK_AREA")", &struct_of_desk_area);
                        eldbus_message_iter_arguments_append(struct_of_desk_area, VALUE_TYPE_FOR_DESK_AREA,
-                                                            zone_id, desk_id_x, desk_id_y, (uint32_t) eda, eda->id, eda->name?:"NO NAME", eda->layer, eda->x, eda->y, eda->w, eda->h,
+                                                            zone_id, desk_id_x, desk_id_y, (uint64_t) desk_area_ptr, eda->id, eda->name?:"NO NAME", eda->layer, eda->x, eda->y, eda->w, eda->h,
                                                             e_desk_desk_area_base_get(desk) == eda ? EINA_TRUE : EINA_FALSE);
 
                        eldbus_message_iter_container_close(array_of_desk_area, struct_of_desk_area);