msvcp60: Avoid FALSE:TRUE conditional expressions.
Michael Stefaniuc
mstefani at redhat.de
Wed Aug 8 14:18:33 CDT 2012
---
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 at DU?$char_traits at D@std@@V?$allocator at 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 at GU?$char_traits at G@std@@V?$allocator at G@2@@std@@2IB */
--
1.7.7.6
More information about the wine-patches
mailing list