Libcperciva import #374
Merged
Libcperciva import #374
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
Reported by: cppcheck-2.11
There were two problems with ${s_count} and ${s_count_str}.
1) ${s_count} and ${s_count_str} are both misnamed: they count the
checks, not the scenarios.
FIX 1/3: both variables should be prefixed with with "c_", not "s_".
2) There was an off-by-one error with ${c_count} and ${c_count_str}.
After running setup_check_variables for the Nth time, ${c_count}
is N, while ${c_count_str} is a zero-padded string containing N-1.
For example, after the first time setup_check_variables() is run, we have:
c_exitfile=tests-output/01-example-00.exit
c_count_str=00
c_count=1
FIX 2/3: ${c_count} should be renamed to ${c_count_next}.
When 15-readpass-file.sh used ${c_count_new} for the stdout file, we
ended up with:
output=tests-output/01-example-1.stdout
which corresponded to 15-readpass-file-00.exit, which is wrong.
FIX 3/3: ${c_count_new} should not be used by anything other than
setup_check_variables(); everything else should use ${c_count_str}.
This should have included when we added it in:
2023-06-29 scripts: misc fixes
ed4c19ad5a55963e69792209a1eafc12f14c068d
This should only have one level of indentation.
Check with:
git grep -A1 -h "#define" -- "*.h" "*.c" | ggrep -P "^\t\t"
There are two instances remaining: getopt.h and readpass.c. Keep those as is.
(The "ggrep" is not a typo; this requires gnu grep to find the tabs.)
|
This does not include |
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.