Skip to content

dead-code patch by renu555 #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 6, 2014
Merged

dead-code patch by renu555 #1

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
17c244e
Fixing unreachable condition.
Jul 2, 2014
66b7738
Fix dead code scenario.
Jul 2, 2014
41b7939
Always true condition.
Jul 2, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Fixing unreachable condition. 
  if (!isMultiLine) at line 563 suggests that isMultiline is 0 when if takes true branch. So the condition && at line 571 will always be false.
Also at line 568 !isMultiline in loop conditional check suggests that it depends only on one condition i.e. index <size because !isMultiline is always true. 
Hence , it seems logical mistake at line 571 of using && instead of ||
  • Loading branch information
@cdunn2001
renu555 authored and cdunn2001 committed Jul 6, 2014
commit 17c244e644c6654d99bd1391bd999c4ab5f5cedc
4 changes: 2 additions & 2 deletions src/lib_json/json_writer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@ bool StyledWriter::isMultineArray(const Value &value) {
for (int index = 0; index < size && !isMultiLine; ++index) {
writeValue(value[index]);
lineLength += int(childValues_[index].length());
isMultiLine = isMultiLine && hasCommentForValue(value[index]);
isMultiLine = isMultiLine || hasCommentForValue(value[index]);
}
addChildValues_ = false;
isMultiLine = isMultiLine || lineLength >= rightMargin_;
Expand Down Expand Up @@ -568,7 +568,7 @@ bool StyledStreamWriter::isMultineArray(const Value &value) {
for (int index = 0; index < size && !isMultiLine; ++index) {
writeValue(value[index]);
lineLength += int(childValues_[index].length());
isMultiLine = isMultiLine && hasCommentForValue(value[index]);
isMultiLine = isMultiLine || hasCommentForValue(value[index]);
}
addChildValues_ = false;
isMultiLine = isMultiLine || lineLength >= rightMargin_;
Expand Down