nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

shadowed declaration warning

Browse Source 
<Someone> complained that his compiler was giving these
warnings:
cmd.c:2119: warning: declaration of `expl' shadows a global declaration
dungeon.c:292: warning: declaration of `rand' shadows a global declaration
exper.c💯 warning: declaration of `exp' shadows a global declaration
files.c:278: warning: declaration of `basename' shadows a global declaration
hack.c:1102: warning: declaration of `expl' shadows a global declaration
pickup.c:2081: warning: declaration of `select' shadows a global declaration
role.c:1060: warning: declaration of `conj' shadows a global declaration
This commit is contained in:
nethack.allison
2004-12-16 00:20:54 +00:00
parent 9bc23ab484
commit 28a1a41668
8 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/files.c
View File

@@ -280,30 +280,30 @@ int bufsz;
/*ARGSUSED*/
#endif
const char *
fqname(basename, whichprefix, buffnum)
const char *basename;
fqname(basenam, whichprefix, buffnum)
const char *basenam;
int whichprefix, buffnum;
{
#ifndef PREFIXES_IN_USE
return basename;
return basenam;
#else
if (!basename || whichprefix < 0 || whichprefix >= PREFIX_COUNT)
return basename;
if (!basenam || whichprefix < 0 || whichprefix >= PREFIX_COUNT)
return basenam;
if (!fqn_prefix[whichprefix])
return basename;
return basenam;
if (buffnum < 0 || buffnum >= FQN_NUMBUF) {
impossible("Invalid fqn_filename_buffer specified: %d",
buffnum);
buffnum = 0;
}
if (strlen(fqn_prefix[whichprefix]) + strlen(basename) >=
if (strlen(fqn_prefix[whichprefix]) + strlen(basenam) >=
FQN_MAX_FILENAME) {
impossible("fqname too long: %s + %s", fqn_prefix[whichprefix],
basename);
return basename; /* XXX */
basenam);
return basenam; /* XXX */
}
Strcpy(fqn_filename_buffer[buffnum], fqn_prefix[whichprefix]);
return strcat(fqn_filename_buffer[buffnum], basename);
return strcat(fqn_filename_buffer[buffnum], basenam);
#endif
}