diff options
| author | Will Newton <will.newton@linaro.org> | 2014-03-31 13:47:56 +0100 |
|---|---|---|
| committer | Will Newton <will.newton@linaro.org> | 2014-04-07 09:44:02 +0100 |
| commit | 8667f90ec51aa88146dce815a9105daf23d9bd07 (patch) | |
| tree | 4ef536ec1362e60ec08c64eca2cd6cce1a7d8dac /string/basename.c | |
| parent | 7ffa9423020fe331b45a56b804c95929a0398e8b (diff) | |
| download | glibc-8667f90ec51aa88146dce815a9105daf23d9bd07.tar.gz glibc-8667f90ec51aa88146dce815a9105daf23d9bd07.tar.xz glibc-8667f90ec51aa88146dce815a9105daf23d9bd07.zip | |
string: Cosmetic cleanup of string functions
Clean up string functions that do not have a version in gnulib on the assumption that glibc is the canonical upstream copy of this code. basename has a copy in gnulib but it is largely written to handle Windows paths so merging it is not really viable. The changes mostly consist of switching to ANSI function prototypes and removing unused includes. As many of these functions do not get built in a typical build due to architecture optimized versions being used instead I built these by hand to verify there were no build warnings and the code was identical. 2014-04-07 Will Newton <will.newton@linaro.org> * string/basename.c [HAVE_CONFIG_H]: Remove #ifdef and and contents. [!_LIBC] Remove #ifndef and contents. (basename): Use ANSI prototype. [_LIBC] Remove #idef. * string/memccpy.c (__memccpy): Use ANSI prototype. * string/memfrob.c (memfrob): Likewise. * string/strcoll.c (STRCOLL): Likewise. * string/strlen.c (strlen): Likewise. * string/strtok.c (STRTOK): Likewise. * string/strcat.c: Remove unused #include of memcopy.h. (strcat): Use ANSI prototype. * string/strchr.c: Remove unused #include of memcopy.h. (strchr): Use ANSI prototype. * string/strcmp.c: Remove unused #include of memcopy.h. (strcmp): Use ANSI prototype. * string/strcpy.c: Remove unused #include of memcopy.h. (strcpy): Use ANSI prototype.
Diffstat (limited to 'string/basename.c')
| -rw-r--r-- | string/basename.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/string/basename.c b/string/basename.c index 29b84eecb4..98bf96c3e2 100644 --- a/string/basename.c +++ b/string/basename.c @@ -16,26 +16,12 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif - #include <string.h> -#ifndef _LIBC -/* We cannot generally use the name `basename' since XPG defines an unusable - variant of the function but we cannot use it. */ -# define basename gnu_basename -#endif - - char * -basename (filename) - const char *filename; +basename (const char *filename) { char *p = strrchr (filename, '/'); return p ? p + 1 : (char *) filename; } -#ifdef _LIBC libc_hidden_def (basename) -#endif |