Skip to content

Commit 182f0aa

Browse files
firewavefirewave
committed
fixed a few valueFlowBailoutIncompleteVar selfcheck warnings
1 parent e9d3d8d commit 182f0aa

7 files changed

Lines changed: 19 additions & 10 deletions

File tree

‎.github/workflows/CI-unixish.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -548,7 +548,8 @@ jobs:
548548
./cppcheck $selfcheck_options externals/simplecpp || ec=1
549549
# self check lib/cli
550550
mkdir b1
551-
./cppcheck $selfcheck_options $cppcheck_options --cppcheck-build-dir=b1 --addon=naming.json cli lib || ec=1
551+
./cppcheck $selfcheck_options $cppcheck_options --cppcheck-build-dir=b1 --addon=naming.json --library=posix cli || ec=1
552+
./cppcheck $selfcheck_options $cppcheck_options --cppcheck-build-dir=b1 --addon=naming.json lib || ec=1
552553
# check gui with qt settings
553554
mkdir b2
554555
./cppcheck $selfcheck_options $cppcheck_options --cppcheck-build-dir=b2 -DQT_VERSION=0x050000 -DQ_MOC_OUTPUT_REVISION=67 -DQT_CHARTS_LIB --library=qt --addon=naming.json -Icmake.output/gui -Igui gui/*.cpp cmake.output/gui || ec=1

‎.github/workflows/asan.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,8 @@ jobs:
134134
cppcheck_options="-D__CPPCHECK__ -DCHECK_INTERNAL -DHAVE_RULES --library=cppcheck-lib -Ilib -Iexternals/simplecpp/ -Iexternals/tinyxml2"
135135
ec=0
136136
./cmake.output/bin/cppcheck $selfcheck_options externals/simplecpp || ec=1
137-
./cmake.output/bin/cppcheck $selfcheck_options $cppcheck_options --addon=naming.json cli lib || ec=1
137+
./cmake.output/bin/cppcheck $selfcheck_options $cppcheck_options --addon=naming.json --library=posix cli || ec=1
138+
./cmake.output/bin/cppcheck $selfcheck_options $cppcheck_options --addon=naming.json lib || ec=1
138139
./cmake.output/bin/cppcheck $selfcheck_options $cppcheck_options -DQT_VERSION=0x060000 -DQ_MOC_OUTPUT_REVISION=68 -DQT_CHARTS_LIB -DQT_MOC_HAS_STRINGDATA --library=qt --addon=naming.json -Icmake.output/gui -Igui gui/*.cpp cmake.output/gui/*.cpp || ec=1
139140
./cmake.output/bin/cppcheck $selfcheck_options $cppcheck_options -Icli test/*.cpp tools/*.cpp || ec=1
140141
./cmake.output/bin/cppcheck $selfcheck_options $cppcheck_options -DQ_MOC_OUTPUT_REVISION=68 -DQT_CHARTS_LIB -DQT_MOC_HAS_STRINGDATA --library=qt -Icmake.output/tools/triage -Igui tools/triage/*.cpp cmake.output/tools/triage/*.cpp || ec=1

‎.github/workflows/selfcheck.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ jobs:
7676
- name: Self check (unusedFunction)
7777
if: false # TODO: fails with preprocessorErrorDirective - see #10667
7878
run: |
79-
./cppcheck -q --template=selfcheck --error-exitcode=1 --library=cppcheck-lib --library=qt -D__CPPCHECK__ -D__GNUC__ -DQT_VERSION=0x060000 -DQ_MOC_OUTPUT_REVISION=68 -DQT_CHARTS_LIB -DQT_MOC_HAS_STRINGDATA --enable=unusedFunction --exception-handling -rp=. --project=cmake.output/compile_commands.json --suppressions-list=.selfcheck_unused_suppressions --inline-suppr
79+
./cppcheck -q --template=selfcheck --error-exitcode=1 --library=cppcheck-lib --library=posix --library=qt -D__CPPCHECK__ -D__GNUC__ -DQT_VERSION=0x060000 -DQ_MOC_OUTPUT_REVISION=68 -DQT_CHARTS_LIB -DQT_MOC_HAS_STRINGDATA --enable=unusedFunction --exception-handling -rp=. --project=cmake.output/compile_commands.json --suppressions-list=.selfcheck_unused_suppressions --inline-suppr
8080
env:
8181
DISABLE_VALUEFLOW: 1
8282
UNUSEDFUNCTION_ONLY: 1
@@ -100,7 +100,7 @@ jobs:
100100
# TODO: find a way to report unmatched suppressions without need to add information checks
101101
- name: Self check (unusedFunction / no test)
102102
run: |
103-
./cppcheck -q --template=selfcheck --error-exitcode=1 --library=cppcheck-lib --library=qt -D__CPPCHECK__ -D__GNUC__ -DQT_VERSION=0x060000 -DQ_MOC_OUTPUT_REVISION=68 -DQT_CHARTS_LIB -DQT_MOC_HAS_STRINGDATA --enable=unusedFunction --exception-handling -rp=. --project=cmake.output.notest/compile_commands.json --suppressions-list=.selfcheck_unused_suppressions --inline-suppr
103+
./cppcheck -q --template=selfcheck --error-exitcode=1 --library=cppcheck-lib --library=posix --library=qt -D__CPPCHECK__ -D__GNUC__ -DQT_VERSION=0x060000 -DQ_MOC_OUTPUT_REVISION=68 -DQT_CHARTS_LIB -DQT_MOC_HAS_STRINGDATA --enable=unusedFunction --exception-handling -rp=. --project=cmake.output.notest/compile_commands.json --suppressions-list=.selfcheck_unused_suppressions --inline-suppr
104104
env:
105105
DISABLE_VALUEFLOW: 1
106106
UNUSEDFUNCTION_ONLY: 1
@@ -119,7 +119,7 @@ jobs:
119119
# TODO: find a way to report unmatched suppressions without need to add information checks
120120
- name: Self check (unusedFunction / no test / no gui)
121121
run: |
122-
./cppcheck -q --template=selfcheck --error-exitcode=1 --library=cppcheck-lib -D__CPPCHECK__ -D__GNUC__ --enable=unusedFunction --exception-handling -rp=. --project=cmake.output.notest_nogui/compile_commands.json --suppressions-list=.selfcheck_unused_suppressions --inline-suppr
122+
./cppcheck -q --template=selfcheck --error-exitcode=1 --library=cppcheck-lib --library=posix -D__CPPCHECK__ -D__GNUC__ --enable=unusedFunction --exception-handling -rp=. --project=cmake.output.notest_nogui/compile_commands.json --suppressions-list=.selfcheck_unused_suppressions --inline-suppr
123123
env:
124124
DISABLE_VALUEFLOW: 1
125125
UNUSEDFUNCTION_ONLY: 1
@@ -169,7 +169,7 @@ jobs:
169169
- name: Self check (unusedFunction / corpus / no test / callgrind)
170170
run: |
171171
# TODO: fix -rp so the suppressions actually work
172-
valgrind --tool=callgrind ./cppcheck --template=selfcheck --error-exitcode=0 --library=cppcheck-lib --library=qt -D__GNUC__ -DQT_VERSION=0x060000 -DQ_MOC_OUTPUT_REVISION=68 -DQT_CHARTS_LIB -DQT_MOC_HAS_STRINGDATA --enable=unusedFunction --exception-handling -rp=. --project=cmake.output.corpus/compile_commands.json --suppressions-list=.selfcheck_unused_suppressions --inline-suppr 2>callgrind.log || (cat callgrind.log && false)
172+
valgrind --tool=callgrind ./cppcheck --template=selfcheck --error-exitcode=0 --library=cppcheck-lib --library=posix --library=qt -D__GNUC__ -DQT_VERSION=0x060000 -DQ_MOC_OUTPUT_REVISION=68 -DQT_CHARTS_LIB -DQT_MOC_HAS_STRINGDATA --enable=unusedFunction --exception-handling -rp=. --project=cmake.output.corpus/compile_commands.json --suppressions-list=.selfcheck_unused_suppressions --inline-suppr 2>callgrind.log || (cat callgrind.log && false)
173173
cat callgrind.log
174174
callgrind_annotate --auto=no > callgrind.annotated.log
175175
head -50 callgrind.annotated.log

‎.github/workflows/tsan.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,8 @@ jobs:
136136
cppcheck_options="-D__CPPCHECK__ -DCHECK_INTERNAL -DHAVE_RULES --library=cppcheck-lib -Ilib -Iexternals/simplecpp/ -Iexternals/tinyxml2"
137137
ec=0
138138
./cmake.output/bin/cppcheck $selfcheck_options externals/simplecpp || ec=1
139-
./cmake.output/bin/cppcheck $selfcheck_options $cppcheck_options --addon=naming.json -DCHECK_INTERNAL cli lib || ec=1
139+
./cmake.output/bin/cppcheck $selfcheck_options $cppcheck_options --addon=naming.json --library=posix cli || ec=1
140+
./cmake.output/bin/cppcheck $selfcheck_options $cppcheck_options --addon=naming.json lib || ec=1
140141
./cmake.output/bin/cppcheck $selfcheck_options $cppcheck_options -DQT_VERSION=0x060000 -DQ_MOC_OUTPUT_REVISION=68 -DQT_CHARTS_LIB -DQT_MOC_HAS_STRINGDATA --library=qt --addon=naming.json -Icmake.output/gui -Igui gui/*.cpp cmake.output/gui/*.cpp || ec=1
141142
./cmake.output/bin/cppcheck $selfcheck_options $cppcheck_options -Icli test/*.cpp tools/*.cpp || ec=1
142143
./cmake.output/bin/cppcheck $selfcheck_options $cppcheck_options -DQ_MOC_OUTPUT_REVISION=68 -DQT_CHARTS_LIB -DQT_MOC_HAS_STRINGDATA --library=qt -Icmake.output/tools/triage -Igui tools/triage/*.cpp cmake.output/tools/triage/*.cpp || ec=1

‎.github/workflows/ubsan.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,8 @@ jobs:
130130
cppcheck_options="-D__CPPCHECK__ -DCHECK_INTERNAL -DHAVE_RULES --library=cppcheck-lib -Ilib -Iexternals/simplecpp/ -Iexternals/tinyxml2"
131131
ec=0
132132
./cmake.output/bin/cppcheck $selfcheck_options externals/simplecpp || ec=1
133-
./cmake.output/bin/cppcheck $selfcheck_options $cppcheck_options --addon=naming.json cli lib || ec=1
133+
./cmake.output/bin/cppcheck $selfcheck_options $cppcheck_options --addon=naming.json --library=posix cli || ec=1
134+
./cmake.output/bin/cppcheck $selfcheck_options $cppcheck_options --addon=naming.json lib || ec=1
134135
./cmake.output/bin/cppcheck $selfcheck_options $cppcheck_options -DQT_VERSION=0x060000 -DQ_MOC_OUTPUT_REVISION=68 -DQT_CHARTS_LIB -DQT_MOC_HAS_STRINGDATA --library=qt --addon=naming.json -Icmake.output/gui -Igui gui/*.cpp cmake.output/gui/*.cpp || ec=1
135136
./cmake.output/bin/cppcheck $selfcheck_options $cppcheck_options -Icli test/*.cpp tools/*.cpp || ec=1
136137
./cmake.output/bin/cppcheck $selfcheck_options $cppcheck_options -DQ_MOC_OUTPUT_REVISION=68 -DQT_CHARTS_LIB -DQT_MOC_HAS_STRINGDATA --library=qt -Icmake.output/tools/triage -Igui tools/triage/*.cpp cmake.output/tools/triage/*.cpp || ec=1

‎cfg/posix.cfg‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5767,6 +5767,8 @@ The function 'mktemp' is considered to be dangerous due to race conditions and s
57675767
<not-bool/>
57685768
</arg>
57695769
</function>
5770+
<define name="SA_SIGINFO" value="4"/>
5771+
<define name="SA_ONSTACK" value="0x08000000"/>
57705772
<!-- http://pubs.opengroup.org/onlinepubs/9699919799/functions/sigaltstack.html -->
57715773
<!-- int sigaltstack(const stack_t *restrict ss, stack_t *restrict oss); -->
57725774
<function name="sigaltstack">

‎cfg/std.cfg‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9105,14 +9105,15 @@ initializer list (7) string& replace (const_iterator i1, const_iterator i2, init
91059105
<podtype name="std::atomic_ptrdiff_t"/>
91069106
<podtype name="std::atomic_intmax_t"/>
91079107
<podtype name="std::atomic_uintmax_t"/>
9108-
<!-- https://en.cppreference.com/w/c/program/SIG_types
9109-
Values are in alignment with posix.cfg -->
9108+
<!-- https://en.cppreference.com/w/c/program/SIG_types -->
91109109
<define name="SIGTERM" value="15"/>
91119110
<define name="SIGSEGV" value="11"/>
91129111
<define name="SIGINT" value="2"/>
91139112
<define name="SIGKILL" value="9"/>
91149113
<define name="SIGABRT" value="6"/>
91159114
<define name="SIGFPE" value="8"/>
9115+
<!-- https://en.cppreference.com/w/c/program/SIG_strategies -->
9116+
<define name="SIG_DFL" value="0"/>
91169117
<!-- http://www.cplusplus.com/reference/cstdio/fseek/ -->
91179118
<define name="SEEK_CUR" value="1"/>
91189119
<define name="SEEK_END" value="2"/>
@@ -9124,4 +9125,6 @@ initializer list (7) string& replace (const_iterator i1, const_iterator i2, init
91249125
<define name="FE_DIVBYZERO" value="8"/>
91259126
<define name="FE_INVALID" value="16"/>
91269127
<define name="FE_ALL_EXCEPT" value="31"/>
9128+
<!-- https://en.cppreference.com/w/c/io -->
9129+
<define name="EOF" value="-1"/>
91279130
</def>

0 commit comments

Comments
 (0)