diff options
| author | Mattias Andrée <maandree@operamail.com> | 2015-09-02 19:45:09 +0200 |
|---|---|---|
| committer | Mattias Andrée <maandree@operamail.com> | 2015-09-02 19:45:09 +0200 |
| commit | f252c29710f71e7c260d9e866c8d4eef885705c3 (patch) | |
| tree | 22614e2bfc48b2901055484eed2f049d9ec4104e /src | |
| parent | m (diff) | |
| download | slibc-f252c29710f71e7c260d9e866c8d4eef885705c3.tar.gz slibc-f252c29710f71e7c260d9e866c8d4eef885705c3.tar.bz2 slibc-f252c29710f71e7c260d9e866c8d4eef885705c3.tar.xz | |
fix some warnings and errors
Signed-off-by: Mattias Andrée <maandree@operamail.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/string/strfry.c | 2 | ||||
| -rw-r--r-- | src/wchar/wcsmove.c | 2 | ||||
| -rw-r--r-- | src/wchar/wcstok.c | 2 |
3 files changed, 3 insertions, 3 deletions
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; |