projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Simplify my *-tests modules.
[gnulib.git]
/
lib
/
glob.c
diff --git
a/lib/glob.c
b/lib/glob.c
index
7499c5b
..
0567902
100644
(file)
--- a/
lib/glob.c
+++ b/
lib/glob.c
@@
-1,4
+1,4
@@
-/* Copyright (C) 1991-2002,
2003, 2004,
2005 Free Software Foundation, Inc.
+/* Copyright (C) 1991-2002,
2003,2004,
2005 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@
-184,9
+184,9
@@
# define GETPW_R_SIZE_MAX() (-1)
#endif
#ifdef _SC_LOGIN_NAME_MAX
# define GETPW_R_SIZE_MAX() (-1)
#endif
#ifdef _SC_LOGIN_NAME_MAX
-# define
LOGIN_NAME_MAX()
sysconf (_SC_LOGIN_NAME_MAX)
+# define
GET_LOGIN_NAME_MAX()
sysconf (_SC_LOGIN_NAME_MAX)
#else
#else
-# define
LOGIN_NAME_MAX()
(-1)
+# define
GET_LOGIN_NAME_MAX()
(-1)
#endif
\f
static const char *next_brace_sub (const char *begin, int flags) __THROW;
#endif
\f
static const char *next_brace_sub (const char *begin, int flags) __THROW;
@@
-240,9
+240,11
@@
int
#ifdef GLOB_ATTRIBUTE
GLOB_ATTRIBUTE
#endif
#ifdef GLOB_ATTRIBUTE
GLOB_ATTRIBUTE
#endif
-glob (const char *pattern, int flags,
- int (*errfunc) (const char *, int),
- glob_t *pglob)
+glob (pattern, flags, errfunc, pglob)
+ const char *pattern;
+ int flags;
+ int (*errfunc) (const char *, int);
+ glob_t *pglob;
{
const char *filename;
const char *dirname;
{
const char *filename;
const char *dirname;
@@
-531,7
+533,7
@@
glob (const char *pattern, int flags,
{
int success;
char *name;
{
int success;
char *name;
- size_t buflen =
LOGIN_NAME_MAX
() + 1;
+ size_t buflen =
GET_LOGIN_NAME_MAX
() + 1;
if (buflen == 0)
/* `sysconf' does not support _SC_LOGIN_NAME_MAX. Try
if (buflen == 0)
/* `sysconf' does not support _SC_LOGIN_NAME_MAX. Try
@@
-888,7
+890,8
@@
libc_hidden_def (glob)
/* Free storage allocated in PGLOB by a previous `glob' call. */
void
/* Free storage allocated in PGLOB by a previous `glob' call. */
void
-globfree (register glob_t *pglob)
+globfree (pglob)
+ register glob_t *pglob;
{
if (pglob->gl_pathv != NULL)
{
{
if (pglob->gl_pathv != NULL)
{
@@
-986,7
+989,9
@@
prefix_array (const char *dirname, char **array, size_t n)
/* Return nonzero if PATTERN contains any metacharacters.
Metacharacters can be quoted with backslashes if QUOTE is nonzero. */
int
/* Return nonzero if PATTERN contains any metacharacters.
Metacharacters can be quoted with backslashes if QUOTE is nonzero. */
int
-__glob_pattern_p (const char *pattern, int quote)
+__glob_pattern_p (pattern, quote)
+ const char *pattern;
+ int quote;
{
register const char *p;
int open = 0;
{
register const char *p;
int open = 0;