projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove __STDC_LIMIT_MACROS and __STDC_CONSTANT_MACROS checks in stdint.h
[musl]
/
src
/
string
/
wcsstr.c
diff --git
a/src/string/wcsstr.c
b/src/string/wcsstr.c
index
966174f
..
037d096
100644
(file)
--- a/
src/string/wcsstr.c
+++ b/
src/string/wcsstr.c
@@
-3,14
+3,6
@@
#include <stdlib.h>
#include <stdint.h>
#include <stdlib.h>
#include <stdint.h>
-static wchar_t *naive_wcsstr(const wchar_t *h, const wchar_t *n)
-{
- size_t i;
- for (i=0; n[i] && h[i]; i++)
- for ( ; n[i] != h[i]; h++, i=0);
- return n[i] ? 0 : (wchar_t *)h;
-}
-
#define MAX(a,b) ((a)>(b)?(a):(b))
#define MIN(a,b) ((a)<(b)?(a):(b))
#define MAX(a,b) ((a)>(b)?(a):(b))
#define MIN(a,b) ((a)<(b)?(a):(b))
@@
-101,7
+93,7
@@
static wchar_t *twoway_wcsstr(const wchar_t *h, const wchar_t *n)
}
}
}
}
-wchar_t *wcsstr(const wchar_t *
h, const wchar_t *
n)
+wchar_t *wcsstr(const wchar_t *
restrict h, const wchar_t *restrict
n)
{
/* Return immediately on empty needle or haystack */
if (!n[0]) return (wchar_t *)h;
{
/* Return immediately on empty needle or haystack */
if (!n[0]) return (wchar_t *)h;
@@
-111,7
+103,6
@@
wchar_t *wcsstr(const wchar_t *h, const wchar_t *n)
h = wcschr(h, *n);
if (!h || !n[1]) return (wchar_t *)h;
if (!h[1]) return 0;
h = wcschr(h, *n);
if (!h || !n[1]) return (wchar_t *)h;
if (!h[1]) return 0;
- if (!n[2] || !n[3] || !n[4]) return naive_wcsstr(h, n);
return twoway_wcsstr(h, n);
}
return twoway_wcsstr(h, n);
}