diff options
| author | Peter S. Mazinger <ps.m@gmx.net> | 2006-02-16 01:10:52 +0000 |
|---|---|---|
| committer | Peter S. Mazinger <ps.m@gmx.net> | 2006-02-16 01:10:52 +0000 |
| commit | c332ab3207185efdfe4c4e7ab0a3b15150d33f91 (patch) | |
| tree | 130decd2bfb35ac5b6dae8e7c724c04cda024c9b | |
| parent | dc034ebbeb84f4cd05840947f0e7dcf369c47e0b (diff) | |
Change collated_compare/prefix_array to __x hidden, shrinks glob64 from 2352 to 2063
| -rw-r--r-- | libc/misc/glob/glob.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/libc/misc/glob/glob.c b/libc/misc/glob/glob.c index b59d62b27..f1875e8e3 100644 --- a/libc/misc/glob/glob.c +++ b/libc/misc/glob/glob.c @@ -44,6 +44,8 @@ extern __ptr_t (*__glob_opendir_hook) (const char *directory) attribute_hidden; extern void (*__glob_closedir_hook) (__ptr_t stream) attribute_hidden; extern const char *(*__glob_readdir_hook) (__ptr_t stream) attribute_hidden; +extern int __collated_compare (const __ptr_t a, const __ptr_t b) attribute_hidden; +extern int __prefix_array (const char *dirname, char **array, size_t n, int add_slash) attribute_hidden; libc_hidden_proto(glob_pattern_p) #ifdef __GLOB64 @@ -88,12 +90,11 @@ int glob_pattern_p(const char *pattern, int quote) return 0; } libc_hidden_def(glob_pattern_p) -#endif /* Do a collated comparison of A and B. */ -static int -collated_compare (const __ptr_t a, const __ptr_t b) +int +__collated_compare (const __ptr_t a, const __ptr_t b) { const char *const s1 = *(const char *const *) a; const char *const s2 = *(const char *const *) b; @@ -114,8 +115,8 @@ collated_compare (const __ptr_t a, const __ptr_t b) unless DIRNAME is just "/". Each old element of ARRAY is freed. If ADD_SLASH is non-zero, allocate one character more than necessary, so that a slash can be appended later. */ -static int -prefix_array (const char *dirname, char **array, size_t n, int add_slash) +int +__prefix_array (const char *dirname, char **array, size_t n, int add_slash) { register size_t i; size_t dirlen = strlen (dirname); @@ -145,6 +146,7 @@ prefix_array (const char *dirname, char **array, size_t n, int add_slash) return 0; } +#endif /* Like `glob', but PATTERN is a final pathname component, @@ -407,7 +409,7 @@ glob (pattern, flags, errfunc, pglob) } /* Stick the directory on the front of each name. */ - if (prefix_array (dirs.gl_pathv[i], + if (__prefix_array (dirs.gl_pathv[i], &pglob->gl_pathv[oldcount], pglob->gl_pathc - oldcount, flags & GLOB_MARK)) @@ -467,7 +469,7 @@ glob (pattern, flags, errfunc, pglob) if (dirlen > 0) { /* Stick the directory on the front of each name. */ - if (prefix_array (dirname, + if (__prefix_array (dirname, &pglob->gl_pathv[oldcount], pglob->gl_pathc - oldcount, flags & GLOB_MARK)) @@ -494,7 +496,7 @@ glob (pattern, flags, errfunc, pglob) /* Sort the vector. */ qsort ((__ptr_t) &pglob->gl_pathv[oldcount], pglob->gl_pathc - oldcount, - sizeof (char *), (__compar_fn_t)collated_compare); + sizeof (char *), (__compar_fn_t)__collated_compare); return 0; } |