andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

hw/xwin: Fix using index as a local variable shadows index()

Browse Source 
Using index as a local variable shadows index() from strings.h

winprefs.c: In function ‘LoadImageComma’:
winprefs.c:574:7: error: declaration of ‘index’ shadows a global declaration

Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
This commit is contained in:
Jon TURNEY 2012-01-25 19:05:42 +00:00
parent 2d9123fd0c
commit 21faee4b38
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hw/xwin/winprefs.c
View File

@ -535,21 +535,21 @@ static HICON
LoadImageComma(char *fname, int sx, int sy, int flags) LoadImageComma(char *fname, int sx, int sy, int flags)
{ {
HICON hicon; HICON hicon;
int index; int i;
char file[PATH_MAX + NAME_MAX + 2]; char file[PATH_MAX + NAME_MAX + 2];
/* Some input error checking */ /* Some input error checking */
if (!fname || !fname[0]) if (!fname || !fname[0])
return NULL; return NULL;
index = 0; i = 0;
hicon = NULL; hicon = NULL;
if (fname[0] == ',') { if (fname[0] == ',') {
/* It's the XWIN.EXE resource they want */ /* It's the XWIN.EXE resource they want */
index = atoi(fname + 1); i = atoi(fname + 1);
hicon = LoadImage(g_hInstance, hicon = LoadImage(g_hInstance,
MAKEINTRESOURCE(index), IMAGE_ICON, sx, sy, flags); MAKEINTRESOURCE(i), IMAGE_ICON, sx, sy, flags);
} }
else { else {
file[0] = 0; file[0] = 0;
@ -566,8 +566,8 @@ LoadImageComma(char *fname, int sx, int sy, int flags)
/* Specified as <fname>,<index> */ /* Specified as <fname>,<index> */
*(strrchr(file, ',')) = 0; /* End string at comma */ *(strrchr(file, ',')) = 0; /* End string at comma */
index = atoi(strrchr(fname, ',') + 1); i = atoi(strrchr(fname, ',') + 1);
hicon = ExtractIcon(g_hInstance, file, index); hicon = ExtractIcon(g_hInstance, file, i);
} }
else { else {
/* Just an .ico file... */ /* Just an .ico file... */