gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-21 05:18:06 +01:00
Code Issues Projects Releases Wiki Activity

Fix variable shadowing

Browse Source 
gcc-4.3.2 warns:
defaults.c:3136: warning: declaration of 'index' shadows a global declaration
/usr/include/string.h:309: warning: shadowed declaration is here

and in a few other places too. Fix this by renaming 'index' to 'widx'.
This commit is contained in:
Carlos R. Mafra
2009-08-18 14:54:15 +02:00
parent 0a32ecf1fe
commit f36ab39680
1 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/defaults.c
View File

@@ -3133,15 +3133,15 @@ setHightlightText(WScreen *scr, WDefaultEntry *entry, XColor *color, void *foo)
static int static int
setClipTitleColor(WScreen *scr, WDefaultEntry *entry, XColor *color, long index) setClipTitleColor(WScreen *scr, WDefaultEntry *entry, XColor *color, long widx)
{ {
if (scr->clip_title_color[index]) if (scr->clip_title_color[widx])
WMReleaseColor(scr->clip_title_color[index]); WMReleaseColor(scr->clip_title_color[widx]);
scr->clip_title_color[index] = WMCreateRGBColor(scr->wmscreen, color->red, scr->clip_title_color[widx] = WMCreateRGBColor(scr->wmscreen, color->red,
color->green, color->blue, color->green, color->blue,
True); True);
#ifdef GRADIENT_CLIP_ARROW #ifdef GRADIENT_CLIP_ARROW
if (index == CLIP_NORMAL) { if (widx == CLIP_NORMAL) {
RImage *image; RImage *image;
RColor color1, color2; RColor color1, color2;
int pt = CLIP_BUTTON_SIZE*wPreferences.icon_size/64; int pt = CLIP_BUTTON_SIZE*wPreferences.icon_size/64;
@@ -3170,12 +3170,12 @@ setClipTitleColor(WScreen *scr, WDefaultEntry *entry, XColor *color, long index)
static int static int
setWTitleColor(WScreen *scr, WDefaultEntry *entry, XColor *color, long index) setWTitleColor(WScreen *scr, WDefaultEntry *entry, XColor *color, long widx)
{ {
if (scr->window_title_color[index]) if (scr->window_title_color[widx])
WMReleaseColor(scr->window_title_color[index]); WMReleaseColor(scr->window_title_color[widx]);
scr->window_title_color[index] = scr->window_title_color[widx] =
WMCreateRGBColor(scr->wmscreen, color->red, color->green, color->blue, WMCreateRGBColor(scr->wmscreen, color->red, color->green, color->blue,
True); True);
@@ -3186,7 +3186,7 @@ setWTitleColor(WScreen *scr, WDefaultEntry *entry, XColor *color, long index)
static int static int
setMenuTitleColor(WScreen *scr, WDefaultEntry *entry, XColor *color, long index) setMenuTitleColor(WScreen *scr, WDefaultEntry *entry, XColor *color, long widx)
{ {
if (scr->menu_title_color[0]) if (scr->menu_title_color[0])
WMReleaseColor(scr->menu_title_color[0]); WMReleaseColor(scr->menu_title_color[0]);
@@ -3518,10 +3518,10 @@ setMenuTextBack(WScreen *scr, WDefaultEntry *entry, WTexture **texture, void *fo
static int static int
setKeyGrab(WScreen *scr, WDefaultEntry *entry, WShortKey *shortcut, long index) setKeyGrab(WScreen *scr, WDefaultEntry *entry, WShortKey *shortcut, long widx)
{ {
WWindow *wwin; WWindow *wwin;
wKeyBindings[index] = *shortcut; wKeyBindings[widx] = *shortcut;
wwin = scr->focused_window; wwin = scr->focused_window;
@@ -3733,15 +3733,15 @@ setDoubleClick(WScreen *scr, WDefaultEntry *entry, int *value, void *foo)
static int static int
setCursor(WScreen *scr, WDefaultEntry *entry, Cursor *cursor, long index) setCursor(WScreen *scr, WDefaultEntry *entry, Cursor *cursor, long widx)
{ {
if (wCursor[index] != None) { if (wCursor[widx] != None) {
XFreeCursor(dpy, wCursor[index]); XFreeCursor(dpy, wCursor[widx]);
} }
wCursor[index] = *cursor; wCursor[widx] = *cursor;
if (index==WCUR_ROOT && *cursor!=None) { if (widx == WCUR_ROOT && *cursor != None) {
XDefineCursor(dpy, scr->root_win, *cursor); XDefineCursor(dpy, scr->root_win, *cursor);
} }