enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 1 Projects Releases Wiki Activity

ecore: Fix shadow warnings 

SVN revision: 62562
This commit is contained in:
Sebastian Dransfeld 2011-08-18 10:59:24 +00:00
parent 8fc827f7c0
commit ea52155aeb
7 changed files with 74 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
legacy/ecore/src/lib/ecore_evas/ecore_evas.c
View File

@ -2122,16 +2122,16 @@ _ecore_evas_fps_debug_init(void)
if (_ecore_evas_fps_debug_fd >= 0) if (_ecore_evas_fps_debug_fd >= 0)
{ {
unsigned int zero = 0; unsigned int zero = 0;
char *buf = (char *)&zero; char *buf2 = (char *)&zero;
ssize_t todo = sizeof(unsigned int); ssize_t todo = sizeof(unsigned int);
while (todo > 0) while (todo > 0)
{ {
ssize_t r = write(_ecore_evas_fps_debug_fd, buf, todo); ssize_t r = write(_ecore_evas_fps_debug_fd, buf2, todo);
if (r > 0) if (r > 0)
{ {
todo -= r; todo -= r;
buf += r; buf2 += r;
} }
else if ((r < 0) && (errno == EINTR)) else if ((r < 0) && (errno == EINTR))
continue; continue;

4
legacy/ecore/src/lib/ecore_x/xlib/ecore_x.c
View File

@ -751,9 +751,9 @@ ecore_x_screen_index_get(const Ecore_X_Screen *screen)
* @since 1.1 * @since 1.1
*/ */
EAPI Ecore_X_Screen * EAPI Ecore_X_Screen *
ecore_x_screen_get(int index) ecore_x_screen_get(int idx)
{ {
return XScreenOfDisplay(_ecore_x_disp, index); return XScreenOfDisplay(_ecore_x_disp, idx);
} }
/** /**

96
legacy/ecore/src/lib/ecore_x/xlib/ecore_x_gc.c
View File

@ -25,7 +25,7 @@ ecore_x_gc_new(Ecore_X_Drawable draw,
{ {
XGCValues gcv; XGCValues gcv;
int mask; int mask;
int index; int idx;
int i; int i;
LOGFN(__FILE__, __LINE__, __FUNCTION__); LOGFN(__FILE__, __LINE__, __FUNCTION__);
@ -34,123 +34,123 @@ ecore_x_gc_new(Ecore_X_Drawable draw,
memset(&gcv, 0, sizeof (gcv)); memset(&gcv, 0, sizeof (gcv));
for (i = 0, index = 0, mask = 1; i <= 22; i++, mask <<= 1) for (i = 0, idx = 0, mask = 1; i <= 22; i++, mask <<= 1)
{ {
switch (mask & value_mask) switch (mask & value_mask)
{ {
case ECORE_X_GC_VALUE_MASK_FUNCTION: case ECORE_X_GC_VALUE_MASK_FUNCTION:
gcv.function = value_list[index]; gcv.function = value_list[idx];
index++; idx++;
break; break;
case ECORE_X_GC_VALUE_MASK_PLANE_MASK: case ECORE_X_GC_VALUE_MASK_PLANE_MASK:
gcv.plane_mask = value_list[index]; gcv.plane_mask = value_list[idx];
index++; idx++;
break; break;
case ECORE_X_GC_VALUE_MASK_FOREGROUND: case ECORE_X_GC_VALUE_MASK_FOREGROUND:
gcv.foreground = value_list[index]; gcv.foreground = value_list[idx];
index++; idx++;
break; break;
case ECORE_X_GC_VALUE_MASK_BACKGROUND: case ECORE_X_GC_VALUE_MASK_BACKGROUND:
gcv.background = value_list[index]; gcv.background = value_list[idx];
index++; idx++;
break; break;
case ECORE_X_GC_VALUE_MASK_LINE_WIDTH: case ECORE_X_GC_VALUE_MASK_LINE_WIDTH:
gcv.line_width = value_list[index]; gcv.line_width = value_list[idx];
index++; idx++;
break; break;
case ECORE_X_GC_VALUE_MASK_LINE_STYLE: case ECORE_X_GC_VALUE_MASK_LINE_STYLE:
gcv.line_style = value_list[index]; gcv.line_style = value_list[idx];
index++; idx++;
break; break;
case ECORE_X_GC_VALUE_MASK_CAP_STYLE: case ECORE_X_GC_VALUE_MASK_CAP_STYLE:
gcv.cap_style = value_list[index]; gcv.cap_style = value_list[idx];
index++; idx++;
break; break;
case ECORE_X_GC_VALUE_MASK_JOIN_STYLE: case ECORE_X_GC_VALUE_MASK_JOIN_STYLE:
gcv.join_style = value_list[index]; gcv.join_style = value_list[idx];
index++; idx++;
break; break;
case ECORE_X_GC_VALUE_MASK_FILL_STYLE: case ECORE_X_GC_VALUE_MASK_FILL_STYLE:
gcv.fill_style = value_list[index]; gcv.fill_style = value_list[idx];
index++; idx++;
break; break;
case ECORE_X_GC_VALUE_MASK_FILL_RULE: case ECORE_X_GC_VALUE_MASK_FILL_RULE:
gcv.fill_rule = value_list[index]; gcv.fill_rule = value_list[idx];
index++; idx++;
break; break;
case ECORE_X_GC_VALUE_MASK_TILE: case ECORE_X_GC_VALUE_MASK_TILE:
gcv.tile = value_list[index]; gcv.tile = value_list[idx];
index++; idx++;
break; break;
case ECORE_X_GC_VALUE_MASK_STIPPLE: case ECORE_X_GC_VALUE_MASK_STIPPLE:
gcv.stipple = value_list[index]; gcv.stipple = value_list[idx];
index++; idx++;
break; break;
case ECORE_X_GC_VALUE_MASK_TILE_STIPPLE_ORIGIN_X: case ECORE_X_GC_VALUE_MASK_TILE_STIPPLE_ORIGIN_X:
gcv.ts_x_origin = value_list[index]; gcv.ts_x_origin = value_list[idx];
index++; idx++;
break; break;
case ECORE_X_GC_VALUE_MASK_TILE_STIPPLE_ORIGIN_Y: case ECORE_X_GC_VALUE_MASK_TILE_STIPPLE_ORIGIN_Y:
gcv.ts_y_origin = value_list[index]; gcv.ts_y_origin = value_list[idx];
index++; idx++;
break; break;
case ECORE_X_GC_VALUE_MASK_FONT: case ECORE_X_GC_VALUE_MASK_FONT:
gcv.font = value_list[index]; gcv.font = value_list[idx];
index++; idx++;
break; break;
case ECORE_X_GC_VALUE_MASK_SUBWINDOW_MODE: case ECORE_X_GC_VALUE_MASK_SUBWINDOW_MODE:
gcv.subwindow_mode = value_list[index]; gcv.subwindow_mode = value_list[idx];
index++; idx++;
break; break;
case ECORE_X_GC_VALUE_MASK_GRAPHICS_EXPOSURES: case ECORE_X_GC_VALUE_MASK_GRAPHICS_EXPOSURES:
gcv.graphics_exposures = value_list[index]; gcv.graphics_exposures = value_list[idx];
index++; idx++;
break; break;
case ECORE_X_GC_VALUE_MASK_CLIP_ORIGIN_X: case ECORE_X_GC_VALUE_MASK_CLIP_ORIGIN_X:
gcv.clip_x_origin = value_list[index]; gcv.clip_x_origin = value_list[idx];
index++; idx++;
break; break;
case ECORE_X_GC_VALUE_MASK_CLIP_ORIGIN_Y: case ECORE_X_GC_VALUE_MASK_CLIP_ORIGIN_Y:
gcv.clip_y_origin = value_list[index]; gcv.clip_y_origin = value_list[idx];
index++; idx++;
break; break;
case ECORE_X_GC_VALUE_MASK_CLIP_MASK: case ECORE_X_GC_VALUE_MASK_CLIP_MASK:
gcv.clip_mask = value_list[index]; gcv.clip_mask = value_list[idx];
index++; idx++;
break; break;
case ECORE_X_GC_VALUE_MASK_DASH_OFFSET: case ECORE_X_GC_VALUE_MASK_DASH_OFFSET:
gcv.dash_offset = value_list[index]; gcv.dash_offset = value_list[idx];
index++; idx++;
break; break;
case ECORE_X_GC_VALUE_MASK_DASH_LIST: case ECORE_X_GC_VALUE_MASK_DASH_LIST:
gcv.dashes = value_list[index]; gcv.dashes = value_list[idx];
index++; idx++;
break; break;
case ECORE_X_GC_VALUE_MASK_ARC_MODE: case ECORE_X_GC_VALUE_MASK_ARC_MODE:
gcv.arc_mode = value_list[index]; gcv.arc_mode = value_list[idx];
index++; idx++;
break; break;
} /* switch */ } /* switch */
} }

10
legacy/ecore/src/lib/ecore_x/xlib/ecore_x_netwm.c
View File

@ -815,15 +815,15 @@ ecore_x_netwm_handled_icons_get(Ecore_X_Window win)
} /* ecore_x_netwm_handled_icons_get */ } /* ecore_x_netwm_handled_icons_get */
EAPI void EAPI void
ecore_x_netwm_user_time_set(Ecore_X_Window win, unsigned int time) ecore_x_netwm_user_time_set(Ecore_X_Window win, unsigned int tim)
{ {
LOGFN(__FILE__, __LINE__, __FUNCTION__); LOGFN(__FILE__, __LINE__, __FUNCTION__);
ecore_x_window_prop_card32_set(win, ECORE_X_ATOM_NET_WM_USER_TIME, ecore_x_window_prop_card32_set(win, ECORE_X_ATOM_NET_WM_USER_TIME,
&time, 1); &tim, 1);
} /* ecore_x_netwm_user_time_set */ } /* ecore_x_netwm_user_time_set */
EAPI Eina_Bool EAPI Eina_Bool
ecore_x_netwm_user_time_get(Ecore_X_Window win, unsigned int *time) ecore_x_netwm_user_time_get(Ecore_X_Window win, unsigned int *tim)
{ {
int ret; int ret;
unsigned int tmp; unsigned int tmp;
@ -831,8 +831,8 @@ ecore_x_netwm_user_time_get(Ecore_X_Window win, unsigned int *time)
LOGFN(__FILE__, __LINE__, __FUNCTION__); LOGFN(__FILE__, __LINE__, __FUNCTION__);
ret = ecore_x_window_prop_card32_get(win, ECORE_X_ATOM_NET_WM_USER_TIME, ret = ecore_x_window_prop_card32_get(win, ECORE_X_ATOM_NET_WM_USER_TIME,
&tmp, 1); &tmp, 1);
if (time) if (tim)
*time = tmp; *tim = tmp;
return ret == 1 ? EINA_TRUE : EINA_FALSE; return ret == 1 ? EINA_TRUE : EINA_FALSE;
} /* ecore_x_netwm_user_time_get */ } /* ecore_x_netwm_user_time_get */

16
legacy/ecore/src/lib/ecore_x/xlib/ecore_x_randr_11.c
View File

@ -156,7 +156,7 @@ ecore_x_randr_screen_primary_output_current_size_get(Ecore_X_Window root,
#ifdef ECORE_XRANDR #ifdef ECORE_XRANDR
XRRScreenSize *sizes; XRRScreenSize *sizes;
XRRScreenConfiguration *sc = NULL; XRRScreenConfiguration *sc = NULL;
int index; int idx;
Rotation orientation; Rotation orientation;
int n; int n;
@ -166,27 +166,27 @@ ecore_x_randr_screen_primary_output_current_size_get(Ecore_X_Window root,
return; return;
} }
index = XRRConfigCurrentConfiguration(sc, &orientation); idx = XRRConfigCurrentConfiguration(sc, &orientation);
sizes = sizes =
XRRSizes(_ecore_x_disp, XRRRootToScreen(_ecore_x_disp, XRRSizes(_ecore_x_disp, XRRRootToScreen(_ecore_x_disp,
root), &n); root), &n);
if ((index < n) && (index >= 0)) if ((idx < n) && (idx >= 0))
{ {
if (w) if (w)
*w = sizes[index].width; *w = sizes[idx].width;
if (h) if (h)
*h = sizes[index].height; *h = sizes[idx].height;
if (w_mm) if (w_mm)
*w_mm = sizes[index].mwidth; *w_mm = sizes[idx].mwidth;
if (h_mm) if (h_mm)
*h_mm = sizes[index].mheight; *h_mm = sizes[idx].mheight;
if (size_index) if (size_index)
*size_index = index; *size_index = idx;
} }
XRRFreeScreenConfigInfo(sc); XRRFreeScreenConfigInfo(sc);

8
legacy/ecore/src/lib/ecore_x/xlib/ecore_x_randr_12.c
View File

@ -919,7 +919,7 @@ ecore_x_randr_crtc_pos_get(Ecore_X_Window root,
EAPI Eina_Bool EAPI Eina_Bool
ecore_x_randr_crtc_clone_set(Ecore_X_Window root, ecore_x_randr_crtc_clone_set(Ecore_X_Window root,
Ecore_X_Randr_Crtc original, Ecore_X_Randr_Crtc original,
Ecore_X_Randr_Crtc clone) Ecore_X_Randr_Crtc clon)
{ {
#ifdef ECORE_XRANDR #ifdef ECORE_XRANDR
RANDR_CHECK_1_2_RET(EINA_FALSE); RANDR_CHECK_1_2_RET(EINA_FALSE);
@ -935,18 +935,18 @@ ecore_x_randr_crtc_clone_set(Ecore_X_Window root,
_ecore_x_randr_crtc_validate(root, _ecore_x_randr_crtc_validate(root,
original) && original) &&
_ecore_x_randr_crtc_validate(root, _ecore_x_randr_crtc_validate(root,
clone) && clon) &&
(res = (res =
_ecore_x_randr_get_screen_resources (_ecore_x_disp, _ecore_x_randr_get_screen_resources (_ecore_x_disp,
root)) && root)) &&
(clone_crtc_info = XRRGetCrtcInfo(_ecore_x_disp, res, clone))) (clone_crtc_info = XRRGetCrtcInfo(_ecore_x_disp, res, clon)))
{ {
ecore_x_randr_crtc_geometry_get(root, original, &x, &y, NULL, NULL); ecore_x_randr_crtc_geometry_get(root, original, &x, &y, NULL, NULL);
original_mode = ecore_x_randr_crtc_mode_get(root, original); original_mode = ecore_x_randr_crtc_mode_get(root, original);
original_orientation = ecore_x_randr_crtc_orientation_get(root, original_orientation = ecore_x_randr_crtc_orientation_get(root,
original); original);
ret = ecore_x_randr_crtc_settings_set(root, ret = ecore_x_randr_crtc_settings_set(root,
clone, clon,
NULL, NULL,
Ecore_X_Randr_Unset, Ecore_X_Randr_Unset,
x, x,

8
legacy/ecore/src/lib/ecore_x/xlib/ecore_x_selection.c
View File

@ -500,7 +500,7 @@ ecore_x_selection_notify_send(Ecore_X_Window requestor,
Ecore_X_Atom selection, Ecore_X_Atom selection,
Ecore_X_Atom target, Ecore_X_Atom target,
Ecore_X_Atom property, Ecore_X_Atom property,
Ecore_X_Time time) Ecore_X_Time tim)
{ {
XEvent xev; XEvent xev;
XSelectionEvent xnotify; XSelectionEvent xnotify;
@ -512,7 +512,7 @@ ecore_x_selection_notify_send(Ecore_X_Window requestor,
xnotify.selection = selection; xnotify.selection = selection;
xnotify.target = target; xnotify.target = target;
xnotify.property = property; xnotify.property = property;
xnotify.time = time; xnotify.time = tim;
xnotify.send_event = True; xnotify.send_event = True;
xnotify.serial = 0; xnotify.serial = 0;
@ -724,9 +724,9 @@ ecore_x_selection_parser_del(const char *target)
* @since 1.1.0 * @since 1.1.0
*/ */
EAPI void EAPI void
ecore_x_selection_owner_set(Ecore_X_Window win, Ecore_X_Atom atom, Ecore_X_Time time) ecore_x_selection_owner_set(Ecore_X_Window win, Ecore_X_Atom atom, Ecore_X_Time tim)
{ {
XSetSelectionOwner(_ecore_x_disp, atom, win, time); XSetSelectionOwner(_ecore_x_disp, atom, win, tim);
} }
/** /**