From 62333e54b8183d3943f83fad2b7eb76db2aaa255 Mon Sep 17 00:00:00 2001 From: Juan Zhao Date: Wed, 30 Oct 2013 13:31:05 +0800 Subject: [PATCH] ecore_x_2w: add pointer check To fix this build issue: phone-0.6.63.25/lib/dialer/ph-dialer-view.c:1150:2: error: invalid use of void expression And the code there is like this: ecore_x_window_size_get(win, &win_width, NULL); So the fix is, to check w and h to avoid when they're null. And one more thing is to use (int *) to use the pointer correctly. --- src/ecore_x_2w.h | 220 ++++++++++++++++++++++++++-------------------------- src/elementary_2w.h | 2 +- src/utilx_2w.h | 2 +- src/xi_2w.h | 8 +- 4 files changed, 116 insertions(+), 116 deletions(-) diff --git a/src/ecore_x_2w.h b/src/ecore_x_2w.h index 7d5e21b..acda35c 100644 --- a/src/ecore_x_2w.h +++ b/src/ecore_x_2w.h @@ -8,341 +8,341 @@ extern "C" { #define ecore_x_window_size_get(win, w, h) \ ({ \ DO_PRAGMA \ - PRINT_LOCATIONS("e_core_x_window_size_get") \ - if(w) \ - *w=(int)X2W_WIDTH; \ - if(h) \ - *h=(int)X2W_HEIGHT; \ + PRINT_LOCATIONS("ecore_x_window_size_get") \ + if((int *)w!=NULL) \ + *(int *)w=(int)X2W_WIDTH; \ + if((int *)h!=NULL) \ + *(int *)h=(int)X2W_HEIGHT; \ }) #define ecore_x_window_prop_any_type() \ - RETURN_INT("e_core_x_window_prop_any_type") + RETURN_INT("ecore_x_window_prop_any_type") #define ecore_x_selection_notify_send(req, sel, tar, p, t) \ - RETURN_INT("e_core_x_selection_notify_send") + RETURN_INT("ecore_x_selection_notify_send") #define ecore_x_selection_clipboard_request(w, target) \ - RETURN_VOID("e_core_x_selection_clipboard_request") + RETURN_VOID("ecore_x_selection_clipboard_request") #define ecore_x_selection_clipboard_set(w, data, size) \ - RETURN_INT("e_core_x_selection_clipboard_set") + RETURN_INT("ecore_x_selection_clipboard_set") #define ecore_x_selection_secondary_set(w,data,size) \ - RETURN_INT("e_core_x_selection_secondary_set") + RETURN_INT("ecore_x_selection_secondary_set") #define ecore_x_selection_secondary_set 0 #define ecore_x_selection_clipboard_set 0 #define ecore_x_flush() \ - RETURN_VOID("e_core_x_flush") + RETURN_VOID("ecore_x_flush") #define ecore_x_window_new(p,x,y,w,hi) \ - RETURN_INT("e_core_x_window_new") + RETURN_INT("ecore_x_window_new") #define ecore_x_window_root_first_get() \ - RETURN_INT("e_core_x_window_root_first_get") + RETURN_INT("ecore_x_window_root_first_get") #define ecore_x_icccm_name_class_set(win, n, c) \ - RETURN_VOID("e_core_x_icccm_name_class_set") + RETURN_VOID("ecore_x_icccm_name_class_set") #define ecore_x_window_prop_string_set(win, type, str) \ - RETURN_VOID("e_core_x_window_prop_string_set") + RETURN_VOID("ecore_x_window_prop_string_set") #define ecore_x_display_get() \ - RETURN_INT("e_core_x_display_get") + RETURN_INT("ecore_x_display_get") #define ecore_x_window_root_get(win) \ - RETURN_INT("e_core_x_window_root_get") + RETURN_INT("ecore_x_window_root_get") #define ecore_x_window_focus_get() \ - RETURN_INT("e_core_x_window_focus_get") \ + RETURN_INT("ecore_x_window_focus_get") \ #define ecore_x_event_mask_set(w, mask) \ - RETURN_VOID("e_core_x_event_mask_set") + RETURN_VOID("ecore_x_event_mask_set") #define ecore_x_window_prop_card32_get(win, atom, val, len) \ - RETURN_INT("e_core_x_window_prop_card32_get") + RETURN_INT("ecore_x_window_prop_card32_get") #define ecore_x_window_prop_property_set(win, type, format, size, data, number) \ - RETURN_VOID("e_core_x_window_prop_property_set") + RETURN_VOID("ecore_x_window_prop_property_set") #define ecore_x_sync() \ - RETURN_VOID("e_core_x_sync") + RETURN_VOID("ecore_x_sync") #define ecore_x_init(name) \ - RETURN_INT("e_core_x_init") + RETURN_INT("ecore_x_init") #define ecore_x_dpi_get() \ - RETURN_INT("e_core_x_dpi_get") + RETURN_INT("ecore_x_dpi_get") #define ecore_x_default_screen_get(void) \ - RETURN_INT("e_core_x_default_screen_get") + RETURN_INT("ecore_x_default_screen_get") #define ecore_x_screen_size_get(screen, w, h) \ - RETURN_VOID("e_core_x_screen_size_get") + RETURN_VOID("ecore_x_screen_size_get") #define ecore_x_window_cursor_set(win, c) \ - RETURN_VOID("e_core_x_window_cursor_set") + RETURN_VOID("ecore_x_window_cursor_set") #define ecore_x_cursor_shape_get(shape) \ - RETURN_INT("e_core_x_cursor_shape_get") + RETURN_INT("ecore_x_cursor_shape_get") #define ecore_x_icccm_title_get(win) \ - RETURN_POINT("e_core_x_icccm_title_get") + RETURN_POINT("ecore_x_icccm_title_get") #define ecore_x_window_input_new(parent, x, y, w, h) \ - RETURN_INT("e_core_x_window_input_new") + RETURN_INT("ecore_x_window_input_new") #define ecore_x_event_mask_unset(w, mask) \ - RETURN_VOID("e_core_x_event_mask_unset") + RETURN_VOID("ecore_x_event_mask_unset") #define ecore_x_icccm_title_set(win, t) \ - RETURN_VOID("e_core_x_icccm_title_set") + RETURN_VOID("ecore_x_icccm_title_set") #define ecore_x_netwm_name_set(win, name) \ - RETURN_VOID("e_core_x_netwm_name_set") + RETURN_VOID("ecore_x_netwm_name_set") #define ecore_x_netwm_pid_set(win, pid) \ - RETURN_VOID("e_core_x_netwm_pid_set") + RETURN_VOID("ecore_x_netwm_pid_set") #define ecore_x_netwm_pid_get(win, pid) \ - RETURN_INT("e_core_x_netwm_pid_get") + RETURN_INT("ecore_x_netwm_pid_get") #define ecore_x_window_delete_request_send(win) \ - RETURN_VOID("e_core_x_window_delete_request_send") + RETURN_VOID("ecore_x_window_delete_request_send") #define ecore_x_netwm_window_type_set(win, type) \ - RETURN_VOID("e_core_x_netwm_window_type_set") + RETURN_VOID("ecore_x_netwm_window_type_set") #define ecore_x_pointer_ungrab(void) \ - RETURN_VOID("e_core_x_pointer_ungrab") + RETURN_VOID("ecore_x_pointer_ungrab") #define ecore_x_icccm_transient_for_set(win,forwin) \ - RETURN_VOID("e_core_x_icccm_transient_for_set") + RETURN_VOID("ecore_x_icccm_transient_for_set") #define ecore_x_window_client_manage(win) \ - RETURN_VOID("e_core_x_window_client_manage") + RETURN_VOID("ecore_x_window_client_manage") #define ecore_x_window_prop_window_get( win, atom, val, len) \ - RETURN_INT("e_core_x_window_prop_window_get") + RETURN_INT("ecore_x_window_prop_window_get") #define ecore_x_e_virtual_keyboard_state_get(win) \ - RETURN_INT("e_core_x_e_virtual_keyboard_state_get") + RETURN_INT("ecore_x_e_virtual_keyboard_state_get") /*check values*/ #define ecore_x_window_prop_xid_get(win, atom, type, lst, len) \ - RETURN_INT("e_core_x_window_prop_xid_get") + RETURN_INT("ecore_x_window_prop_xid_get") #define ecore_x_window_prop_property_get(win, property, type, size, data, num) \ - RETURN_INT("e_core_x_window_prop_property_get") + RETURN_INT("ecore_x_window_prop_property_get") #define ecore_x_netwm_name_get(win, name) \ - RETURN_INT("e_core_x_netwm_name_get") + RETURN_INT("ecore_x_netwm_name_get") #define ecore_x_window_shape_input_rectangle_set(win, x, y, w, h) \ - RETURN_VOID("e_core_x_window_shape_input_rectangle_set) + RETURN_VOID("ecore_x_window_shape_input_rectangle_set) #define ecore_x_e_virtual_keyboard_state_set(win, state) \ - RETURN_VOID("e_core_x_e_virtual_keyboard_state_set") + RETURN_VOID("ecore_x_e_virtual_keyboard_state_set") #define ecore_x_window_prop_card32_set(win, atom, val, num) \ - RETURN_VOID("e_core_x_window_prop_card32_set") + RETURN_VOID("ecore_x_window_prop_card32_set") #define ecore_x_window_prop_xid_set(win, atom, type, lst, num) \ - RETURN_VOID("e_core_x_window_prop_xid_set") + RETURN_VOID("ecore_x_window_prop_xid_set") #define ecore_x_window_prop_window_list_get(win, atom, plst) \ - RETURN_INT("e_core_x_window_prop_window_list_get") + RETURN_INT("ecore_x_window_prop_window_list_get") #define ecore_x_netwm_opacity_set(win, opacity) \ - RETURN_VOID("e_core_x_netwm_opacity_set") + RETURN_VOID("ecore_x_netwm_opacity_set") #define ecore_x_atom_get(atom) \ - RETURN_INT("e_core_x_atom_get") + RETURN_INT("ecore_x_atom_get") #define ecore_x_e_illume_keyboard_geometry_set(win, x, y, w, h) \ - RETURN_VOID("e_core_x_e_illume_keyboard_geometry_set") + RETURN_VOID("ecore_x_e_illume_keyboard_geometry_set") #define ecore_x_e_illume_zone_set(win, zone) \ - RETURN_VOID("e_core_x_e_illume_zone_set") + RETURN_VOID("ecore_x_e_illume_zone_set") #define ecore_x_e_illume_zone_get(win) \ - RETURN_INT("e_core_x_e_illume_zone_get") + RETURN_INT("ecore_x_e_illume_zone_get") #define ecore_x_e_illume_zone_list_set(win,zones, n_zones) \ - RETURN_VOID("e_core_x_e_illume_zone_list_set") + RETURN_VOID("ecore_x_e_illume_zone_list_set") #define ecore_x_e_illume_conformant_set(win, is_conformant) \ - RETURN_VOID("e_core_x_e_illume_conformant_set") + RETURN_VOID("ecore_x_e_illume_conformant_set") #define ecore_x_e_illume_conformant_get(win) \ - RETURN_INT("e_core_x_e_illume_conformant_get") + RETURN_INT("ecore_x_e_illume_conformant_get") #define ecore_x_e_illume_mode_set(win, mode) \ - RETURN_VOID("e_core_x_e_illume_mode_set") + RETURN_VOID("ecore_x_e_illume_mode_set") #define ecore_x_e_illume_mode_get(win) \ - RETURN_INT("e_core_x_e_illume_mode_get") + RETURN_INT("ecore_x_e_illume_mode_get") #define ecore_x_e_illume_mode_send(win, mode) \ - RETURN_VOID("e_core_x_e_illume_mode_send") + RETURN_VOID("ecore_x_e_illume_mode_send") #define ecore_x_e_illume_focus_back_send(win) \ - RETURN_VOID("e_core_x_e_illume_focus_back_send") + RETURN_VOID("ecore_x_e_illume_focus_back_send") #define ecore_x_e_illume_focus_forward_send(win) \ - RETURN_VOID("e_core_x_e_illume_focus_forward_send") + RETURN_VOID("ecore_x_e_illume_focus_forward_send") #define ecore_x_e_illume_focus_home_send(win) \ - RETURN_VOID("e_core_x_e_illume_focus_home_send") + RETURN_VOID("ecore_x_e_illume_focus_home_send") #define ecore_x_e_illume_close_send(win) \ - RETURN_VOID("e_core_x_e_illume_close_send") + RETURN_VOID("ecore_x_e_illume_close_send") #define ecore_x_e_illume_home_new_send(win) \ - RETURN_VOID("e_core_x_e_illume_home_new_send") + RETURN_VOID("ecore_x_e_illume_home_new_send") #define ecore_x_e_illume_home_del_send(win) \ - RETURN_VOID("e_core_x_e_illume_home_del_send") + RETURN_VOID("ecore_x_e_illume_home_del_send") #define ecore_x_e_illume_access_action_next_send(win) \ - RETURN_VOID("e_core_x_e_illume_access_action_next_send") + RETURN_VOID("ecore_x_e_illume_access_action_next_send") #define ecore_x_e_illume_access_action_prev_send(win) \ RETURN_VOID("e core_x_e_illume_access_action_prev_send") #define ecore_x_e_illume_access_action_activate_send(win) \ - RETURN_VOID("e_core_x_e_illume_access_action_activate_send") + RETURN_VOID("ecore_x_e_illume_access_action_activate_send") #define ecore_x_e_illume_access_action_read_send(win) \ - RETURN_VOID("e_core_x_e_illume_access_action_read_send") + RETURN_VOID("ecore_x_e_illume_access_action_read_send") #define ecore_x_e_illume_access_action_read_next_send(win) \ - RETURN_VOID("e_core_x_e_illume_access_action_read_next_send") + RETURN_VOID("ecore_x_e_illume_access_action_read_next_send") #define ecore_x_e_illume_access_action_read_prev_send(win) \ - RETURN_VOID("e_core_x_e_illume_access_action_read_prev_send") + RETURN_VOID("ecore_x_e_illume_access_action_read_prev_send") #define ecore_x_e_illume_access_action_up_send(win) \ - RETURN_VOID("e_core_x_e_illume_access_action_up_send") + RETURN_VOID("ecore_x_e_illume_access_action_up_send") #define ecore_x_e_illume_access_action_down_send(win) \ - RETURN_VOID("e_core_x_e_illume_access_action_down_send") + RETURN_VOID("ecore_x_e_illume_access_action_down_send") #define ecore_x_e_illume_drag_set(win, drag) \ - RETURN_VOID("e_core_x_e_illume_drag_set") + RETURN_VOID("ecore_x_e_illume_drag_set") #define ecore_x_e_illume_drag_get(win) \ - RETURN_INT("e_core_x_e_illume_drag_get") + RETURN_INT("ecore_x_e_illume_drag_get") #define ecore_x_e_illume_drag_locked_set(win, is_locked) \ - RETURN_VOID("e_core_x_e_illume_drag_locked_set") + RETURN_VOID("ecore_x_e_illume_drag_locked_set") #define ecore_x_e_illume_drag_locked_get(win) \ - RETURN_INT("e_core_x_e_illume_drag_locked_get") + RETURN_INT("ecore_x_e_illume_drag_locked_get") #define ecore_x_e_illume_drag_start_send(win) \ RETURN_VOID("e core_x_e_illume_drag_start_send") #define ecore_x_e_illume_drag_end_send(win) \ - RETURN_VOID("e_core_x_e_illume_drag_end_send") + RETURN_VOID("ecore_x_e_illume_drag_end_send") #define ecore_x_e_illume_indicator_geometry_set(win, x, y, w, h) \ - RETURN_VOID("e_core_x_e_illume_indicator_geometry_set") + RETURN_VOID("ecore_x_e_illume_indicator_geometry_set") #define ecore_x_e_illume_indicator_geometry_get(win,x,y,w,h) \ - RETURN_INT("e_core_x_e_illume_indicator_geometry_get") + RETURN_INT("ecore_x_e_illume_indicator_geometry_get") #define ecore_x_e_illume_softkey_geometry_set(win, x, y, w, h) \ - RETURN_VOID("e_core_x_e_illume_softkey_geometry_set") + RETURN_VOID("ecore_x_e_illume_softkey_geometry_set") #define ecore_x_e_illume_softkey_geometry_get(win,x,y,w,h) \ - RETURN_VOID("e_core_x_e_illume_softkey_geometry_get") + RETURN_VOID("ecore_x_e_illume_softkey_geometry_get") #define ecore_x_e_illume_keyboard_geometry_get(win,x,y,w,h) \ - RETURN_INT("e_core_x_e_illume_keyboard_geometry_get") + RETURN_INT("ecore_x_e_illume_keyboard_geometry_get") #define ecore_x_e_illume_quickpanel_set(win, is_quickpanel) \ - RETURN_VOID("e_core_x_e_illume_quickpanel_set") + RETURN_VOID("ecore_x_e_illume_quickpanel_set") #define ecore_x_e_illume_quickpanel_get(win) \ - RETURN_INT("e_core_x_e_illume_quickpanel_get") + RETURN_INT("ecore_x_e_illume_quickpanel_get") #define ecore_x_e_illume_quickpanel_state_set(win, state) \ - RETURN_VOID("e_core_x_e_illume_quickpanel_state_set") + RETURN_VOID("ecore_x_e_illume_quickpanel_state_set") #define ecore_x_e_illume_quickpanel_state_get(win) \ - RETURN_INT("e_core_x_e_illume_quickpanel_state_get") + RETURN_INT("ecore_x_e_illume_quickpanel_state_get") #define ecore_x_e_illume_quickpanel_state_send(win, state) \ - RETURN_VOID("e_core_x_e_illume_quickpanel_state_send") + RETURN_VOID("ecore_x_e_illume_quickpanel_state_send") #define ecore_x_e_illume_quickpanel_state_toggle(win) \ - RETURN_VOID("e_core_x_e_illume_quickpanel_state_toggle") + RETURN_VOID("ecore_x_e_illume_quickpanel_state_toggle") #define ecore_x_e_illume_quickpanel_priority_major_set(win, priority) \ - RETURN_VOID("e_core_x_e_illume_quickpanel_priority_major_set") + RETURN_VOID("ecore_x_e_illume_quickpanel_priority_major_set") #define ecore_x_e_illume_quickpanel_priority_major_get(win) \ - RETURN_INT("e_core_x_e_illume_quickpanel_priority_major_get") + RETURN_INT("ecore_x_e_illume_quickpanel_priority_major_get") #define ecore_x_e_illume_quickpanel_priority_minor_set(win, priority) \ - RETURN_VOID("e_core_x_e_illume_quickpanel_priority_minor_set") + RETURN_VOID("ecore_x_e_illume_quickpanel_priority_minor_set") #define ecore_x_e_illume_quickpanel_priority_minor_get(win) \ - RETURN_INT("e_core_x_e_illume_quickpanel_priority_minor_get") + RETURN_INT("ecore_x_e_illume_quickpanel_priority_minor_get") #define ecore_x_e_illume_quickpanel_zone_set(win, zone) \ - RETURN_VOID("e_core_x_e_illume_quickpanel_zone_set") + RETURN_VOID("ecore_x_e_illume_quickpanel_zone_set") #define ecore_x_e_illume_quickpanel_zone_get(win) \ - RETURN_INT("e_core_x_e_illume_quickpanel_zone_get") + RETURN_INT("ecore_x_e_illume_quickpanel_zone_get") #define ecore_x_e_illume_quickpanel_zone_request_send(win) \ - RETURN_VOID("e_core_x_e_illume_quickpanel_zone_request_send") + RETURN_VOID("ecore_x_e_illume_quickpanel_zone_request_send") #define ecore_x_e_illume_quickpanel_position_update_send(win) \ - RETURN_VOID("e_core_x_e_illume_quickpanel_position_update_send") + RETURN_VOID("ecore_x_e_illume_quickpanel_position_update_send") #define ecore_x_e_illume_clipboard_state_set(win, state) \ - RETURN_VOID("e_core_x_e_illume_clipboard_state_set") + RETURN_VOID("ecore_x_e_illume_clipboard_state_set") #define ecore_x_e_illume_clipboard_state_get(win) \ - RETURN_INT("e_core_x_e_illume_clipboard_state_get") + RETURN_INT("ecore_x_e_illume_clipboard_state_get") #define ecore_x_e_illume_clipboard_geometry_set(win, x, y, w, h) \ - RETURN_VOID("e_core_x_e_illume_clipboard_geometry_set") + RETURN_VOID("ecore_x_e_illume_clipboard_geometry_set") #define ecore_x_e_illume_clipboard_geometry_get(win,x,y,w,h) \ - RETURN_INT("e_core_x_e_illume_clipboard_geometry_get") + RETURN_INT("ecore_x_e_illume_clipboard_geometry_get") #define ecore_x_e_illume_indicator_state_set(win, state) \ - RETURN_VOID("e_core_x_e_illume_indicator_state_set") + RETURN_VOID("ecore_x_e_illume_indicator_state_set") #define ecore_x_e_illume_indicator_state_get(win) \ - RETURN_INT("e_core_x_e_illume_indicator_state_get") + RETURN_INT("ecore_x_e_illume_indicator_state_get") #define ecore_x_e_illume_indicator_state_send(win, state) \ - RETURN_VOID("e_core_x_e_illume_indicator_state_send") + RETURN_VOID("ecore_x_e_illume_indicator_state_send") #define ecore_x_e_illume_indicator_opacity_set(win, mode) \ - RETURN_VOID("e_core_x_e_illume_indicator_opacity_set") + RETURN_VOID("ecore_x_e_illume_indicator_opacity_set") #define ecore_x_e_illume_indicator_opacity_get(win) \ - RETURN_INT("e_core_x_e_illume_indicator_opacity_get") + RETURN_INT("ecore_x_e_illume_indicator_opacity_get") #define ecore_x_e_illume_indicator_opacity_send(win, mode) \ - RETURN_VOID("e_core_x_e_illume_indicator_opacity_send") + RETURN_VOID("ecore_x_e_illume_indicator_opacity_send") #define ecore_x_e_illume_window_state_get(win) \ - RETURN_INT("e_core_x_e_illume_window_state_get") + RETURN_INT("ecore_x_e_illume_window_state_get") #define ecore_x_e_illume_window_state_set(win, state) \ - RETURN_VOID("e_core_x_e_illume_window_state_set") + RETURN_VOID("ecore_x_e_illume_window_state_set") #define ecore_x_window_configure(iwin,mask,x,y,w,h,border_width,isibling,stack_mode) \ RETURN_VOID("ecore_x_window_configure") diff --git a/src/elementary_2w.h b/src/elementary_2w.h index dcbd9a0..e8cf9ae 100644 --- a/src/elementary_2w.h +++ b/src/elementary_2w.h @@ -7,7 +7,7 @@ extern "C" { #include "x2w_general.h" #define elm_win_xwindow_get(win) \ - RETURN_INT("e_lm_win_xwindow_get") + RETURN_INT("elm_win_xwindow_get") #ifdef __cplusplus } /* extern "C" */ diff --git a/src/utilx_2w.h b/src/utilx_2w.h index d7d22c3..817b267 100644 --- a/src/utilx_2w.h +++ b/src/utilx_2w.h @@ -7,7 +7,7 @@ extern "C" { #include "x2w_general.h" #define utilx_hide_fake_effect(dpy, win) \ - RETURN_VOID("u_tilx_hide_fake_effect") + RETURN_VOID("utilx_hide_fake_effect") #ifdef __cplusplus } /* extern "C" */ diff --git a/src/xi_2w.h b/src/xi_2w.h index e2dd99e..b038867 100644 --- a/src/xi_2w.h +++ b/src/xi_2w.h @@ -7,16 +7,16 @@ extern "C" { #include "x2w_general.h" #define XIQueryVersion( dpy, major_version_inout, minor_version_inout ) \ - RETURN_INT("X_IQueryVersion") + RETURN_INT("XIQueryVersion") #define XIGetProperty(dis,dev,prop,o,l,d,t,ct,f,n, b, d2) \ - RETURN_INT("X_IGetProperty") + RETURN_INT("XIGetProperty") #define XIQueryDevice( dpy,deviceid,ndevices_return) \ - RETURN_POINT("X_IQueryDevice") + RETURN_POINT("XIQueryDevice") #define XIFreeDeviceInfo(info) \ - RETURN_VOID("X_IFreeDeviceInfo") + RETURN_VOID("XIFreeDeviceInfo") #ifdef __cplusplus } /* extern "C" */ -- 2.7.4