diff options
| author | ericroman@google.com <ericroman@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-05 18:37:51 +0000 |
|---|---|---|
| committer | ericroman@google.com <ericroman@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-05 18:37:51 +0000 |
| commit | b930d13574dc5dd5a7f6a2ea706f58d9f00959cc (patch) | |
| tree | 670156bb42dfcf3876182d07bb60e88418e73f08 /base/json_reader.cc | |
| parent | 3f09649ae0477cf182033a8d3d507716372c31ad (diff) | |
| download | chromium_src-b930d13574dc5dd5a7f6a2ea706f58d9f00959cc.zip chromium_src-b930d13574dc5dd5a7f6a2ea706f58d9f00959cc.tar.gz chromium_src-b930d13574dc5dd5a7f6a2ea706f58d9f00959cc.tar.bz2 | |
Update some comments/nits following r7486.
Review URL: http://codereview.chromium.org/17047
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7547 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/json_reader.cc')
| -rw-r--r-- | base/json_reader.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/base/json_reader.cc b/base/json_reader.cc index bf233a6..f3dfc75 100644 --- a/base/json_reader.cc +++ b/base/json_reader.cc @@ -136,7 +136,7 @@ Value* JSONReader::JsonToValue(const std::string& json, bool check_root, // When the input JSON string starts with a UTF-8 Byte-Order-Mark // (0xEF, 0xBB, 0xBF), the UTF8ToWide() function converts it to a Unicode // BOM (U+FEFF). To avoid the JSONReader::BuildValue() function from - // mis-treating a Unicode BOM as an invalid character and returning false, + // mis-treating a Unicode BOM as an invalid character and returning NULL, // skip a converted Unicode BOM if it exists. if (!json_wide.empty() && start_pos_[0] == 0xFEFF) { ++start_pos_; @@ -217,9 +217,8 @@ Value* JSONReader::BuildValue(bool is_root) { node.reset(new ListValue()); while (token.type != Token::ARRAY_END) { Value* array_node = BuildValue(false); - if (!array_node) { + if (!array_node) return NULL; - } static_cast<ListValue*>(node.get())->Append(array_node); // After a list value, we expect a comma or the end of the list. |