From f252c29710f71e7c260d9e866c8d4eef885705c3 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Wed, 2 Sep 2015 19:45:09 +0200 Subject: fix some warnings and errors MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- src/string/strfry.c | 2 +- src/wchar/wcsmove.c | 2 +- src/wchar/wcstok.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/string/strfry.c b/src/string/strfry.c index cf8d643..da6d0ac 100644 --- a/src/string/strfry.c +++ b/src/string/strfry.c @@ -41,7 +41,7 @@ char* strfry(char* anagram) for (i = strlen(anagram); --i;) { r = rand(); - j = (int)((double)r / (RAND_MAX + 1)); + j = (size_t)((double)r / (RAND_MAX + 1) * (double)i); t = anagram[i], anagram[i] = anagram[j], anagram[j] = t; } return anagram; diff --git a/src/wchar/wcsmove.c b/src/wchar/wcsmove.c index 041d194..4e2f773 100644 --- a/src/wchar/wcsmove.c +++ b/src/wchar/wcsmove.c @@ -212,7 +212,7 @@ wchar_t* wcscnmove(wchar_t* whither, const wchar_t* whence, wchar_t c, size_t ma * one character passed the last written non-NUL * character. */ -wchar_t* wcswcsnmove(wchar_t* whither, const wchar_t* whence, const wchar_t* restrict str, size_t maxlen) +wchar_t* wcsstrnmove(wchar_t* whither, const wchar_t* whence, const wchar_t* restrict str, size_t maxlen) { const wchar_t* stop = wcsnstr(whence, str, maxlen); size_t n = stop == NULL ? wcsnlen(whence, maxlen) : (size_t)(stop - whence); diff --git a/src/wchar/wcstok.c b/src/wchar/wcstok.c index 9ca3929..583defd 100644 --- a/src/wchar/wcstok.c +++ b/src/wchar/wcstok.c @@ -79,7 +79,7 @@ wchar_t* wcssep(wchar_t** restrict string, const wchar_t* restrict delimiters) if (r == NULL) return NULL; - next = wcrpbrk(r, delimiters); + next = wcspbrk(r, delimiters); if (next != NULL) *next++ = 0; *string = next; -- cgit v1.2.3-70-g09d2