oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Additional changes to make -Wshadow build on Ubuntu 10.04.

Browse Source 
Looks like they defined basename() in string.h and ntohs/htonl are
implemented in terms of __bswap16() which is a macro with tmp
variables and so one cannot embed one call to ntohs/htons in another.
Not good but we workaround this limitation in glibc.
This commit is contained in:
Roland C. Dowdeswell
2012-06-07 16:59:01 +01:00
parent 5459558dea
commit abdde6a608
6 changed files with 47 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/roken/glob.c
View File

@@ -404,7 +404,7 @@ static int
glob0(const Char *pattern, glob_t *pglob)
{
const Char *qpatnext;
int c, err, oldpathc;
int c, ret, oldpathc;
Char *bufnext, patbuf[MaxPathLen+1];
size_t limit = 0;
@@ -464,8 +464,8 @@ glob0(const Char *pattern, glob_t *pglob)
qprintf("glob0:", patbuf);
#endif
if ((err = glob1(patbuf, pglob, &limit)) != 0)
return(err);
if ((ret = glob1(patbuf, pglob, &limit)) != 0)
return(ret);
/*
* If there was no match we are going to append the pattern
@@ -572,7 +572,7 @@ glob3(Char *pathbuf, Char *pathend, Char *pattern, Char *restpattern,
{
struct dirent *dp;
DIR *dirp;
int err;
int ret;
char buf[MaxPathLen];
/*
@@ -597,7 +597,7 @@ glob3(Char *pathbuf, Char *pathend, Char *pattern, Char *restpattern,
return(0);
}
err = 0;
ret = 0;
/* Search directory for matching names. */
if (pglob->gl_flags & GLOB_ALTDIRFUNC)
@@ -618,8 +618,8 @@ glob3(Char *pathbuf, Char *pathend, Char *pattern, Char *restpattern,
*pathend = CHAR_EOS;
continue;
}
err = glob2(pathbuf, --dc, restpattern, pglob, limit);
if (err)
ret = glob2(pathbuf, --dc, restpattern, pglob, limit);
if (ret)
break;
}
@@ -627,7 +627,7 @@ glob3(Char *pathbuf, Char *pathend, Char *pattern, Char *restpattern,
(*pglob->gl_closedir)(dirp);
else
closedir(dirp);
return(err);
return(ret);
}