summaryrefslogtreecommitdiffstats
path: root/libc/string/generic/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/generic/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/generic/strsep.c')
-rw-r--r--libc/string/generic/strsep.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/libc/string/generic/strsep.c b/libc/string/generic/strsep.c
index 762b07ff9..7b34e2c16 100644
--- a/libc/string/generic/strsep.c
+++ b/libc/string/generic/strsep.c
@@ -16,11 +16,13 @@
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
-#define strpbrk __strpbrk
-
#include <string.h>
-char attribute_hidden *__strsep (char **stringp, const char *delim)
+libc_hidden_proto(strsep)
+libc_hidden_proto(strchr)
+libc_hidden_proto(strpbrk)
+
+char *strsep (char **stringp, const char *delim)
{
char *begin, *end;
@@ -44,7 +46,7 @@ char attribute_hidden *__strsep (char **stringp, const char *delim)
else if (*begin == '\0')
end = NULL;
else
- end = __strchr (begin + 1, ch);
+ end = strchr (begin + 1, ch);
}
}
else
@@ -63,5 +65,4 @@ char attribute_hidden *__strsep (char **stringp, const char *delim)
return begin;
}
-
-strong_alias(__strsep,strsep)
+libc_hidden_def(strsep)