Merge pull request #224 from pah/cleanup/223-coverity

Reader::Parse{Array,Object}: simplify switch

Merge pull request #224 from pah/cleanup/223-coverity
Reader::Parse{Array,Object}: simplify switch
29fa1558 · Milo Yip · 8c8ce369 · 0ee38bc9 · 29fa1558
Commit 29fa1558 authored Jan 12, 2015 by Milo Yip
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 4 deletions

reader.h include/rapidjson/reader.h +2 -4

No files found.
--- a/include/rapidjson/reader.h
+++ b/include/rapidjson/reader.h
@@ -512,8 +512,7 @@ private:
                case '}': 
                    if (!handler.EndObject(memberCount))
                        RAPIDJSON_PARSE_ERROR(kParseErrorTermination, is.Tell());
-                    else
-                        return;
+                    return;
                default:  RAPIDJSON_PARSE_ERROR(kParseErrorObjectMissCommaOrCurlyBracket, is.Tell());
            }
        }
@@ -549,8 +548,7 @@ private:
                case ']': 
                    if (!handler.EndArray(elementCount))
                        RAPIDJSON_PARSE_ERROR(kParseErrorTermination, is.Tell());
-                    else
-                        return;
+                    return;
                default:  RAPIDJSON_PARSE_ERROR(kParseErrorArrayMissCommaOrSquareBracket, is.Tell());
            }
        }