address two cppcheck findings #1799
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This was found by cppcheck:
[src/gui/dialogs/wml_message.cpp:174] -> [src/gui/dialogs/wml_message.cpp:177]: (warning) Either the condition 'right' is redundant or there is possible null pointer dereference: right.
Code was as follows:
if(left && !right) {
dlg.reset(new wml_message_left(title, message, left->portrait, left->mirror));
} else if(!left && right) {
dlg.reset(new wml_message_right(title, message, right->portrait, right->mirror));
} else {
dlg.reset(new wml_message_double(title, message, left->portrait, left->mirror, right->portrait, right->mirror));
}
left right => branch taken
T T else {}
T F if {}
F T elseif {}
F F else {} // we could possibly access left->foo and right->foo here
Make else {} into an explicit else if (right && left) {}
…ion and definition the same. Found by cppcheck: [src/ai/configuration.hpp:108] -> [src/ai/configuration.cpp:178]: (warning) Function 'parse_side_config' argument order different: declaration 'side, cfg, parsed_cfg' definition 'side, original_cfg, cfg' Rename arguments in declaration (configuration.hpp) from 'side, cfg, parsed_cfg' to 'side, original_cfg, cfg'.
|
If you're renaming parameters, you also need to fix the doc comment. |
|
As an aside, I'd prefer if you didn't put code in your commit messages. The code is right there in the diff, so adding it to the commit message is pointlessly redundant. (If the code was somehow unrelated to the diff, that might be a different story.) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.