msvcp100: Avoid FALSE:TRUE conditional expressions.

Michael Stefaniuc mstefani at redhat.de
Wed Nov 14 05:29:59 CST 2012


---
 dlls/msvcp100/string.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/msvcp100/string.c b/dlls/msvcp100/string.c
index 7faf95f..9771ace 100644
--- a/dlls/msvcp100/string.c
+++ b/dlls/msvcp100/string.c
@@ -189,7 +189,7 @@ static MSVCP_bool basic_string_char_inside(
 {
     char *cstr = basic_string_char_ptr(this);
 
-    return (ptr<cstr || ptr>=cstr+this->size) ? FALSE : TRUE;
+    return ptr>=cstr && ptr<cstr+this->size;
 }
 
 /* ?_Tidy@?$basic_string at DU?$char_traits at D@std@@V?$allocator at D@2@@std@@IAEX_NI at Z */
@@ -474,7 +474,7 @@ static MSVCP_bool basic_string_wchar_inside(
 {
     wchar_t *cstr = basic_string_wchar_ptr(this);
 
-    return (ptr<cstr || ptr>=cstr+this->size) ? FALSE : TRUE;
+    return ptr>=cstr && ptr<cstr+this->size;
 }
 
 /* ?_Tidy@?$basic_string at _WU?$char_traits at _W@std@@V?$allocator at _W@2@@std@@IAEX_NI at Z */
-- 
1.7.7.6



More information about the wine-patches mailing list