about summary refs log tree commit diff
path: root/string/strtok.c
diff options
context:
space:
mode:
authorWill Newton <will.newton@linaro.org>2014-03-31 13:47:56 +0100
committerWill Newton <will.newton@linaro.org>2014-04-07 09:44:02 +0100
commit8667f90ec51aa88146dce815a9105daf23d9bd07 (patch)
tree4ef536ec1362e60ec08c64eca2cd6cce1a7d8dac /string/strtok.c
parent7ffa9423020fe331b45a56b804c95929a0398e8b (diff)
downloadglibc-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/strtok.c')
-rw-r--r--string/strtok.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/string/strtok.c b/string/strtok.c
index 225344003e..924313e878 100644
--- a/string/strtok.c
+++ b/string/strtok.c
@@ -36,9 +36,7 @@ static char *olds;
 		// s = "abc\0=-def\0"
 */
 char *
-STRTOK (s, delim)
-     char *s;
-     const char *delim;
+STRTOK (char *s, const char *delim)
 {
   char *token;