summaryrefslogtreecommitdiff
path: root/src/lib/libc/string/strtok.c
diff options
context:
space:
mode:
authorguenther <>2015-08-31 02:53:57 +0000
committerguenther <>2015-08-31 02:53:57 +0000
commit9bfe2450029c26d54ebb48f0d8c01d35b63865d3 (patch)
treebb414296df7d65acc4ba9b4159bf5979ae934d04 /src/lib/libc/string/strtok.c
parent4f937c61ae895d4e27690c1e2bb8bc911a3b4a12 (diff)
downloadopenbsd-9bfe2450029c26d54ebb48f0d8c01d35b63865d3.tar.gz
openbsd-9bfe2450029c26d54ebb48f0d8c01d35b63865d3.tar.bz2
openbsd-9bfe2450029c26d54ebb48f0d8c01d35b63865d3.zip
Add framework for resolving (pun intended) libc namespace issues, using
wrapper .h files and asm labels to let internal calls resolve directly and not be overridable or use the PLT. Then, apply that framework to most of the functions in stdio.h, string.h, err.h, and wchar.h. Delete the should-have-been-hidden-all-along _v?(err|warn)[cx]? symbols while here. tests clean on i386, amd64, sparc64, powerpc, and mips64 naming feedback from kettenis@ and millert@ ok kettenis@
Diffstat (limited to 'src/lib/libc/string/strtok.c')
-rw-r--r--src/lib/libc/string/strtok.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/lib/libc/string/strtok.c b/src/lib/libc/string/strtok.c
index 6ba6b21cd6..c5765756fc 100644
--- a/src/lib/libc/string/strtok.c
+++ b/src/lib/libc/string/strtok.c
@@ -36,6 +36,7 @@ strtok(char *s, const char *delim)
36 36
37 return strtok_r(s, delim, &last); 37 return strtok_r(s, delim, &last);
38} 38}
39DEF_STRONG(strtok);
39 40
40char * 41char *
41strtok_r(char *s, const char *delim, char **last) 42strtok_r(char *s, const char *delim, char **last)
@@ -83,3 +84,4 @@ cont:
83 } 84 }
84 /* NOTREACHED */ 85 /* NOTREACHED */
85} 86}
87DEF_WEAK(strtok_r);