summaryrefslogtreecommitdiffstats
path: root/libc/string/strsep.c
diff options
context:
space:
mode:
author"Steven J. Hill" <sjhill@realitydiluted.com>2006-02-25 04:03:33 +0000
committer"Steven J. Hill" <sjhill@realitydiluted.com>2006-02-25 04:03:33 +0000
commitcb6a88484ce0b5ffba2fe98a40e2d51f4af92eb8 (patch)
tree520f8e8d113184cfa7954ebd274564b8c255fa9a /libc/string/strsep.c
parente4461be66e2655058aef358b00050bc70ac72861 (diff)
downloaduClibc-alpine-cb6a88484ce0b5ffba2fe98a40e2d51f4af92eb8.tar.bz2
uClibc-alpine-cb6a88484ce0b5ffba2fe98a40e2d51f4af92eb8.tar.xz
Merge from trunk. Going pretty good so far. Kind of. Okay, not really.
Diffstat (limited to 'libc/string/strsep.c')
-rw-r--r--libc/string/strsep.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/libc/string/strsep.c b/libc/string/strsep.c
index 993fafecb..7f421891e 100644
--- a/libc/string/strsep.c
+++ b/libc/string/strsep.c
@@ -7,18 +7,22 @@
#include "_string.h"
-char attribute_hidden *__strsep(char ** __restrict s1, const char * __restrict s2)
+libc_hidden_proto(strsep)
+libc_hidden_proto(strpbrk)
+libc_hidden_proto(strcspn)
+
+char *strsep(char ** __restrict s1, const char * __restrict s2)
{
register char *s = *s1;
register char *p;
#if 1
p = NULL;
- if (s && *s && (p = __strpbrk(s, s2))) {
+ if (s && *s && (p = strpbrk(s, s2))) {
*p++ = 0;
}
#else
- if (s && *s && *(p = s + __strcspn(s, s2))) {
+ if (s && *s && *(p = s + strcspn(s, s2))) {
*p++ = 0;
} else {
p = NULL;
@@ -27,5 +31,4 @@ char attribute_hidden *__strsep(char ** __restrict s1, const char * __restrict s
*s1 = p;
return s;
}
-
-strong_alias(__strsep,strsep)
+libc_hidden_def(strsep)