AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-01-03 08:11:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update.

Browse Source 
2000-12-02  Ulrich Drepper  <drepper@redhat.com>

	* sysdeps/generic/glob.c: Adjust types of several variables to
	avoid warnings.
This commit is contained in:
Ulrich Drepper 2000-12-02 08:18:55 +00:00
parent 68f672c9f8
commit ec6f84770e
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2000-12-02 Ulrich Drepper <drepper@redhat.com>
* sysdeps/generic/glob.c: Adjust types of several variables to
avoid warnings.
2000-12-01 Ulrich Drepper <drepper@redhat.com> 2000-12-01 Ulrich Drepper <drepper@redhat.com>
* sysdeps/unix/sysv/linux/shm_open.c: Remove incorrect comment. * sysdeps/unix/sysv/linux/shm_open.c: Remove incorrect comment.

16
sysdeps/generic/glob.c
View File

@ -379,7 +379,7 @@ glob (pattern, flags, errfunc, pglob)
const char *dirname; const char *dirname;
size_t dirlen; size_t dirlen;
int status; int status;
int oldcount; size_t oldcount;
if (pattern == NULL || pglob == NULL || (flags & ~__GLOB_FLAGS) != 0) if (pattern == NULL || pglob == NULL || (flags & ~__GLOB_FLAGS) != 0)
{ {
@ -399,7 +399,7 @@ glob (pattern, flags, errfunc, pglob)
{ {
/* Allocate working buffer large enough for our work. Note that /* Allocate working buffer large enough for our work. Note that
we have at least an opening and closing brace. */ we have at least an opening and closing brace. */
int firstc; size_t firstc;
char *alt_start; char *alt_start;
const char *p; const char *p;
const char *next; const char *next;
@ -622,7 +622,7 @@ glob (pattern, flags, errfunc, pglob)
pglob->gl_pathv = NULL; pglob->gl_pathv = NULL;
else else
{ {
int i; size_t i;
pglob->gl_pathv = (char **) malloc ((pglob->gl_offs + 1) pglob->gl_pathv = (char **) malloc ((pglob->gl_offs + 1)
* sizeof (char *)); * sizeof (char *));
if (pglob->gl_pathv == NULL) if (pglob->gl_pathv == NULL)
@ -671,7 +671,7 @@ glob (pattern, flags, errfunc, pglob)
{ {
struct passwd *p; struct passwd *p;
# if defined HAVE_GETPWNAM_R || defined _LIBC # if defined HAVE_GETPWNAM_R || defined _LIBC
size_t pwbuflen = sysconf (_SC_GETPW_R_SIZE_MAX); long int pwbuflen = sysconf (_SC_GETPW_R_SIZE_MAX);
char *pwtmpbuf; char *pwtmpbuf;
struct passwd pwbuf; struct passwd pwbuf;
int save = errno; int save = errno;
@ -755,7 +755,7 @@ glob (pattern, flags, errfunc, pglob)
{ {
struct passwd *p; struct passwd *p;
# if defined HAVE_GETPWNAM_R || defined _LIBC # if defined HAVE_GETPWNAM_R || defined _LIBC
size_t buflen = sysconf (_SC_GETPW_R_SIZE_MAX); long int buflen = sysconf (_SC_GETPW_R_SIZE_MAX);
char *pwtmpbuf; char *pwtmpbuf;
struct passwd pwbuf; struct passwd pwbuf;
int save = errno; int save = errno;
@ -868,7 +868,7 @@ glob (pattern, flags, errfunc, pglob)
have to glob for the directory, and then glob for have to glob for the directory, and then glob for
the pattern in each directory found. */ the pattern in each directory found. */
glob_t dirs; glob_t dirs;
register int i; size_t i;
if ((flags & GLOB_ALTDIRFUNC) != 0) if ((flags & GLOB_ALTDIRFUNC) != 0)
{ {
@ -1046,7 +1046,7 @@ glob (pattern, flags, errfunc, pglob)
if (flags & GLOB_MARK) if (flags & GLOB_MARK)
{ {
/* Append slashes to directory names. */ /* Append slashes to directory names. */
int i; size_t i;
struct stat st; struct stat st;
#ifdef HAVE_STAT64 #ifdef HAVE_STAT64
struct stat64 st64; struct stat64 st64;
@ -1092,7 +1092,7 @@ globfree (pglob)
{ {
if (pglob->gl_pathv != NULL) if (pglob->gl_pathv != NULL)
{ {
register int i; size_t i;
for (i = 0; i < pglob->gl_pathc; ++i) for (i = 0; i < pglob->gl_pathc; ++i)
if (pglob->gl_pathv[pglob->gl_offs + i] != NULL) if (pglob->gl_pathv[pglob->gl_offs + i] != NULL)
free ((__ptr_t) pglob->gl_pathv[pglob->gl_offs + i]); free ((__ptr_t) pglob->gl_pathv[pglob->gl_offs + i]);