From 9d589aa0d63e1eb088b10f065ee7fb0765d2e285 Mon Sep 17 00:00:00 2001 From: Brad Fitzpatrick Date: Wed, 20 Oct 2010 17:06:28 -0700 Subject: [PATCH] Revert "Add length-equality test in String operator== checks." This reverts commit e28210d401ae4ed1258b84c9b17a172a757190e8. --- include/utils/String16.h | 4 +--- include/utils/String8.h | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/include/utils/String16.h b/include/utils/String16.h index d98b2d04d..07a0c1188 100644 --- a/include/utils/String16.h +++ b/include/utils/String16.h @@ -205,9 +205,7 @@ inline bool String16::operator<=(const String16& other) const inline bool String16::operator==(const String16& other) const { - const size_t n1 = size(); - const size_t n2 = other.size(); - return n1 == n2 && strzcmp16(mString, n1, other.mString, n2) == 0; + return strzcmp16(mString, size(), other.mString, other.size()) == 0; } inline bool String16::operator!=(const String16& other) const diff --git a/include/utils/String8.h b/include/utils/String8.h index a1292227e..cef8ecab9 100644 --- a/include/utils/String8.h +++ b/include/utils/String8.h @@ -418,9 +418,7 @@ inline bool String8::operator<=(const String8& other) const inline bool String8::operator==(const String8& other) const { - return (SharedBuffer::sizeFromData(mString) == - SharedBuffer::sizeFromData(other.mString)) && - strcmp(mString, other.mString) == 0; + return strcmp(mString, other.mString) == 0; } inline bool String8::operator!=(const String8& other) const