Michael Stefaniuc : msvcp60: Avoid FALSE:TRUE conditional expressions.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 47e472af10092fab903ab487e21ca7f063a0c6fa
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=47e472af10092fab903ab487e2...

Author: Michael Stefaniuc 
Date:   Wed Aug  8 21:18:33 2012 +0200

msvcp60: Avoid FALSE:TRUE conditional expressions.

---

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

diff --git a/dlls/msvcp60/string.c b/dlls/msvcp60/string.c
index a935de1..cac9596 100644
--- a/dlls/msvcp60/string.c
+++ b/dlls/msvcp60/string.c
@@ -115,7 +115,7 @@ static const char* char_traits_char_find(const char *str,
 static MSVCP_bool basic_string_char_inside(
         basic_string_char *this, const char *ptr)
 {
-    return (ptr<this->ptr || ptr>=this->ptr+this->size) ? FALSE : TRUE;
+    return ptr>=this->ptr && ptr<this->ptr+this->size;
 }

/* ?npos@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@2IB */
@@ -1811,7 +1811,7 @@ static const wchar_t* char_traits_wchar_find(const wchar_t *str,
 static MSVCP_bool basic_string_wchar_inside(
         basic_string_wchar *this, const wchar_t *ptr)
 {
-    return (ptr<this->ptr || ptr>=this->ptr+this->size) ? FALSE : TRUE;
+    return ptr>=this->ptr && ptr<this->ptr+this->size;
 }

/* ?npos@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@2IB */