diff --git a/libc/string/strchr.cpp b/libc/string/strchr.cpp index 63ea3e24..c36a065c 100644 --- a/libc/string/strchr.cpp +++ b/libc/string/strchr.cpp @@ -1,6 +1,6 @@ /******************************************************************************* - Copyright(C) Jonas 'Sortie' Termansen 2011, 2012, 2013. + Copyright(C) Jonas 'Sortie' Termansen 2011, 2012, 2013, 2014. This file is part of the Sortix C Library. @@ -27,5 +27,5 @@ extern "C" char* strchr(const char* str, int uc) { char* ret = strchrnul(str, uc); - return uc == ((unsigned char*) ret)[0] ? ret : NULL; + return (unsigned char) uc == ((unsigned char*) ret)[0] ? ret : NULL; } diff --git a/libc/string/strchrnul.cpp b/libc/string/strchrnul.cpp index b7d07e8c..a35d75e6 100644 --- a/libc/string/strchrnul.cpp +++ b/libc/string/strchrnul.cpp @@ -1,6 +1,6 @@ /******************************************************************************* - Copyright(C) Jonas 'Sortie' Termansen 2011, 2012, 2013. + Copyright(C) Jonas 'Sortie' Termansen 2011, 2012, 2013, 2014. This file is part of the Sortix C Library. @@ -28,6 +28,6 @@ extern "C" char* strchrnul(const char* str, int uc) { const unsigned char* ustr = (const unsigned char*) str; for ( size_t i = 0; true; i++) - if ( ustr[i] == uc || !ustr[i] ) + if ( ustr[i] == (unsigned char) uc || !ustr[i] ) return (char*) str + i; } diff --git a/libc/string/strrchr.cpp b/libc/string/strrchr.cpp index a0874c84..ebf380b2 100644 --- a/libc/string/strrchr.cpp +++ b/libc/string/strrchr.cpp @@ -1,6 +1,6 @@ /******************************************************************************* - Copyright(C) Jonas 'Sortie' Termansen 2011, 2012, 2013. + Copyright(C) Jonas 'Sortie' Termansen 2011, 2012, 2013, 2014. This file is part of the Sortix C Library. @@ -30,7 +30,7 @@ extern "C" char* strrchr(const char* str, int uc) const char* last = NULL; for ( size_t i = 0; true; i++ ) { - if ( ustr[i] == uc ) + if ( ustr[i] == (unsigned char) uc ) last = str + i; if ( !ustr[i] ) break;