mirror of
git://sourceware.org/git/newlib-cygwin.git
synced 2025-01-18 20:39:33 +08:00
e02866a1b4
A few files were missing headers for memset/malloc, likely missed
because the files don't directly call the functions, rather they
come in via macros in libc/include/sys/reent.h:
#define _REENT_CHECK(var, what, type, size, init) do { \
struct _reent *_r = (var); \
if (_r->what == NULL) { \
_r->what = (type)malloc(size); \
#define _REENT_CHECK_ASCTIME_BUF(var) \
_REENT_CHECK(var, _asctime_buf, char *, _REENT_ASCTIME_SIZE, \
memset((var)->_asctime_buf, 0, _REENT_ASCTIME_SIZE))
Without these fixes, implicit function signatures are provided,
which gcc warns could cause aliasing issues down the line:
../../../../../../../newlib-2.5.0/newlib/libc/time/asctime.c:62:3: warning: type of 'memset' does not match original declaration [-Wlto-type-mismatch]
/Volumes/code/external/newlib-cygwin/newlib/libc/include/string.h:29:7: note: return value type mismatch
_PTR _EXFUN(memset,(_PTR, int, size_t));
^
/Volumes/code/external/newlib-cygwin/newlib/libc/include/string.h:29:7: note: 'memset' was previously declared here
/Volumes/code/external/newlib-cygwin/newlib/libc/include/string.h:29:7: note: code may be misoptimized unless -fno-strict-aliasing is used
../../../../../../../newlib-2.5.0/newlib/libc/time/asctime.c:62:3: warning: type of 'malloc' does not match original declaration [-Wlto-type-mismatch]
/Volumes/code/external/newlib-cygwin/newlib/libc/include/malloc.h:37:13: note: return value type mismatch
extern _PTR malloc _PARAMS ((size_t));
^
/Volumes/code/external/newlib-cygwin/newlib/libc/include/malloc.h:37:13: note: 'malloc' was previously declared here
/Volumes/code/external/newlib-cygwin/newlib/libc/include/malloc.h:37:13: note: code may be misoptimized unless -fno-strict-aliasing is used
../../../../../../../newlib-2.5.0/newlib/libc/time/lcltime.c:58:3: warning: type of 'malloc' does not match original declaration [-Wlto-type-mismatch]
/Volumes/code/external/newlib-cygwin/newlib/libc/include/malloc.h:37:13: note: return value type mismatch
extern _PTR malloc _PARAMS ((size_t));
^
/Volumes/code/external/newlib-cygwin/newlib/libc/include/malloc.h:37:13: note: 'malloc' was previously declared here
/Volumes/code/external/newlib-cygwin/newlib/libc/include/malloc.h:37:13: note: code may be misoptimized unless -fno-strict-aliasing is used
../../../../../../../newlib-2.5.0/newlib/libc/string/strsignal.c:70:3: warning: type of 'malloc' does not match original declaration [-Wlto-type-mismatch]
/Volumes/code/external/newlib-cygwin/newlib/libc/include/malloc.h:37:13: note: return value type mismatch
extern _PTR malloc _PARAMS ((size_t));
^
/Volumes/code/external/newlib-cygwin/newlib/libc/include/malloc.h:37:13: note: 'malloc' was previously declared here
/Volumes/code/external/newlib-cygwin/newlib/libc/include/malloc.h:37:13: note: code may be misoptimized unless -fno-strict-aliasing is used
Including the proper headers elminates the implicit function
signatures and these warnings.
107 lines
3.2 KiB
C
107 lines
3.2 KiB
C
/*
|
|
FUNCTION
|
|
<<strtok>>, <<strtok_r>>, <<strsep>>---get next token from a string
|
|
|
|
INDEX
|
|
strtok
|
|
|
|
INDEX
|
|
strtok_r
|
|
|
|
INDEX
|
|
strsep
|
|
|
|
ANSI_SYNOPSIS
|
|
#include <string.h>
|
|
char *strtok(char *restrict <[source]>,
|
|
const char *restrict <[delimiters]>);
|
|
char *strtok_r(char *restrict <[source]>,
|
|
const char *restrict <[delimiters]>,
|
|
char **<[lasts]>);
|
|
char *strsep(char **<[source_ptr]>, const char *<[delimiters]>);
|
|
|
|
TRAD_SYNOPSIS
|
|
#include <string.h>
|
|
char *strtok(<[source]>, <[delimiters]>);
|
|
char *<[source]>;
|
|
char *<[delimiters]>;
|
|
|
|
char *strtok_r(<[source]>, <[delimiters]>, <[lasts]>);
|
|
char *<[source]>;
|
|
char *<[delimiters]>;
|
|
char **<[lasts]>;
|
|
|
|
char *strsep(<[source_ptr]>, <[delimiters]>);
|
|
char **<[source_ptr]>;
|
|
char *<[delimiters]>;
|
|
|
|
DESCRIPTION
|
|
The <<strtok>> function is used to isolate sequential tokens in a
|
|
null-terminated string, <<*<[source]>>>. These tokens are delimited
|
|
in the string by at least one of the characters in <<*<[delimiters]>>>.
|
|
The first time that <<strtok>> is called, <<*<[source]>>> should be
|
|
specified; subsequent calls, wishing to obtain further tokens from
|
|
the same string, should pass a null pointer instead. The separator
|
|
string, <<*<[delimiters]>>>, must be supplied each time and may
|
|
change between calls.
|
|
|
|
The <<strtok>> function returns a pointer to the beginning of each
|
|
subsequent token in the string, after replacing the separator
|
|
character itself with a null character. When no more tokens remain,
|
|
a null pointer is returned.
|
|
|
|
The <<strtok_r>> function has the same behavior as <<strtok>>, except
|
|
a pointer to placeholder <<*<[lasts]>>> must be supplied by the caller.
|
|
|
|
The <<strsep>> function is similar in behavior to <<strtok>>, except
|
|
a pointer to the string pointer must be supplied <<<[source_ptr]>>> and
|
|
the function does not skip leading delimiters. When the string starts
|
|
with a delimiter, the delimiter is changed to the null character and
|
|
the empty string is returned. Like <<strtok_r>> and <<strtok>>, the
|
|
<<*<[source_ptr]>>> is updated to the next character following the
|
|
last delimiter found or NULL if the end of string is reached with
|
|
no more delimiters.
|
|
|
|
RETURNS
|
|
<<strtok>>, <<strtok_r>>, and <<strsep>> all return a pointer to the
|
|
next token, or <<NULL>> if no more tokens can be found. For
|
|
<<strsep>>, a token may be the empty string.
|
|
|
|
NOTES
|
|
<<strtok>> is unsafe for multi-threaded applications. <<strtok_r>>
|
|
and <<strsep>> are thread-safe and should be used instead.
|
|
|
|
PORTABILITY
|
|
<<strtok>> is ANSI C.
|
|
<<strtok_r>> is POSIX.
|
|
<<strsep>> is a BSD extension.
|
|
|
|
<<strtok>>, <<strtok_r>>, and <<strsep>> require no supporting OS subroutines.
|
|
|
|
QUICKREF
|
|
strtok ansi impure
|
|
*/
|
|
|
|
/* undef STRICT_ANSI so that strtok_r prototype will be defined */
|
|
#undef __STRICT_ANSI__
|
|
#include <string.h>
|
|
#include <stdlib.h>
|
|
#include <_ansi.h>
|
|
#include <reent.h>
|
|
|
|
#ifndef _REENT_ONLY
|
|
|
|
extern char *__strtok_r (char *, const char *, char **, int);
|
|
|
|
char *
|
|
_DEFUN (strtok, (s, delim),
|
|
register char *__restrict s _AND
|
|
register const char *__restrict delim)
|
|
{
|
|
struct _reent *reent = _REENT;
|
|
|
|
_REENT_CHECK_MISC(reent);
|
|
return __strtok_r (s, delim, &(_REENT_STRTOK_LAST(reent)), 1);
|
|
}
|
|
#endif
|