diff options
| author | Mattias Andrée <maandree@operamail.com> | 2015-09-01 21:07:54 +0200 |
|---|---|---|
| committer | Mattias Andrée <maandree@operamail.com> | 2015-09-01 21:07:54 +0200 |
| commit | ac044784a6ce64ff15610d4b70750065a7f01b80 (patch) | |
| tree | 8ac8629c0089099f21be9107a5d3779963d33ca0 /src/wchar/wcsmove.c | |
| parent | add memfrob (diff) | |
| download | slibc-ac044784a6ce64ff15610d4b70750065a7f01b80.tar.gz slibc-ac044784a6ce64ff15610d4b70750065a7f01b80.tar.bz2 slibc-ac044784a6ce64ff15610d4b70750065a7f01b80.tar.xz | |
start on makefile and fixing warnings and errors
Signed-off-by: Mattias Andrée <maandree@operamail.com>
Diffstat (limited to '')
| -rw-r--r-- | src/wchar/wcsmove.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/wchar/wcsmove.c b/src/wchar/wcsmove.c index c84e4ee..bf86928 100644 --- a/src/wchar/wcsmove.c +++ b/src/wchar/wcsmove.c @@ -16,7 +16,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include <wchar.h> -#include <stddef.h> @@ -69,7 +68,7 @@ wchar_t* wcpmove(wchar_t* whither, const wchar_t* whence) * one character passed the last written non-NUL * character. */ -wchar_t* wcscmove(wchar_t* whither, const wchar_t* whence, wchat_t c) +wchar_t* wcscmove(wchar_t* whither, const wchar_t* whence, wchar_t c) { wchar_t* r = wmemcmove(whither, whence, c, wcslen(whence) + 1); if (r) @@ -98,7 +97,7 @@ wchar_t* wcswcsmove(wchar_t* whither, const wchar_t* whence, const wchar_t* rest { const wchar_t* stop = str == NULL ? NULL : wcsstr(whence, str); size_t n = stop == NULL ? wcslen(whence) : (size_t)(stop - whence); - wchar_t* r = stop == NULL ? NULL ? whither + n; + wchar_t* r = stop == NULL ? NULL : (whither + n); wmemmove(whither, whence, n); whither[n] = 0; return r; @@ -179,11 +178,11 @@ wchar_t* wcpnmove(wchar_t* whither, const wchar_t* whence, size_t maxlen) * one character passed the last written non-NUL * character. */ -wchar_t* wcscnmove(wchar_t* whither, const wchar_t* whence, wchat_t c, size_t maxlen) +wchar_t* wcscnmove(wchar_t* whither, const wchar_t* whence, wchar_t c, size_t maxlen) { - const char* stop = wmemchr(whence, c, maxlen); + const wchar_t* stop = wmemchr(whence, c, maxlen); size_t n = stop == NULL ? wcsnlen(whence, maxlen) : (size_t)(stop - whence); - char* r = stop == NULL ? NULL : (whither + n); + wchar_t* r = stop == NULL ? NULL : (whither + n); wmemmove(whither, whence, n); wmemset(whither, 0, maxlen - n); return r; @@ -215,9 +214,9 @@ wchar_t* wcscnmove(wchar_t* whither, const wchar_t* whence, wchat_t c, size_t ma */ wchar_t* wcswcsnmove(wchar_t* whither, const wchar_t* whence, const wchar_t* restrict str, size_t maxlen) { - const char* stop = wcsnstr(whence, str, maxlen); + const wchar_t* stop = wcsnstr(whence, str, maxlen); size_t n = stop == NULL ? wcsnlen(whence, maxlen) : (size_t)(stop - whence); - char* r = stop == NULL ? NULL : (whither + n); + wchar_t* r = stop == NULL ? NULL : (whither + n); wmemmove(whither, whence, n); wmemset(whither, 0, maxlen - n); return r; |