generic-library/jsoncpp
1
0
Fork 0
mirror of https://github.com/open-source-parsers/jsoncpp.git synced 2025-06-07 09:04:57 +02:00
Code Issues Projects Releases Wiki Activity

use memcmp in CZString

Browse Source 
This is a loss of efficiency, but it prepares for an increase when we
have stored lengths.
This commit is contained in:
Christopher Dunn 2015-03-02 11:18:06 -06:00
parent 5d79275a5b
commit b383fdc61e
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/lib_json/json_value.cpp
View File

@ -190,15 +190,27 @@ Value::CZString& Value::CZString::operator=(CZString other) {
} }
bool Value::CZString::operator<(const CZString& other) const { bool Value::CZString::operator<(const CZString& other) const {
if (cstr_) if (!cstr_) return index_ < other.index_;
return strcmp(cstr_, other.cstr_) < 0; //return strcmp(cstr_, other.cstr_) < 0;
return index_ < other.index_; // Assume both are strings.
unsigned this_len = strlen(this->cstr_);
unsigned other_len = strlen(other.cstr_);
unsigned min_len = std::min(this_len, other_len);
int comp = memcmp(this->cstr_, other.cstr_, min_len);
if (comp < 0) return true;
if (comp > 0) return false;
return (this_len < other_len);
} }
bool Value::CZString::operator==(const CZString& other) const { bool Value::CZString::operator==(const CZString& other) const {
if (cstr_) if (!cstr_) return index_ == other.index_;
return strcmp(cstr_, other.cstr_) == 0; //return strcmp(cstr_, other.cstr_) == 0;
return index_ == other.index_; // Assume both are strings.
unsigned this_len = strlen(this->cstr_);
unsigned other_len = strlen(other.cstr_);
if (this_len != other_len) return false;
int comp = memcmp(this->cstr_, other.cstr_, this_len);
return comp == 0;
} }
ArrayIndex Value::CZString::index() const { return index_; } ArrayIndex Value::CZString::index() const { return index_; }