Skip to content

Comments

Fix compiler warnings, part 10#1395

Merged
nilason merged 1 commit intoOSGeo:masterfrom
nilason:fix-compiler-warnings-10
Mar 8, 2021
Merged

Fix compiler warnings, part 10#1395
nilason merged 1 commit intoOSGeo:masterfrom
nilason:fix-compiler-warnings-10

Conversation

@nilason
Copy link
Contributor

@nilason nilason commented Feb 21, 2021

Remove argument not used by format string
Fixes -Wformat-extra-args compiler warnings.

This was originally part of #1274, but separated in hope for finding a better solution.

Tenth part addressing #1247.

Compiler warning:

main.c:166:30: warning: data argument not used by format string [-Wformat-extra-args]
                             WEIGHTS[i][j]);
                             ^

This was referenced Feb 21, 2021
Closed
Closed
@nilason
r.fill.stats: Remove dead code in matrix print
0623ee3 
The removed 'if' condition was never true and the faulty use
of snprintf was never reached.
@nilason nilason force-pushed the fix-compiler-warnings-10 branch from c9bd1af to 0623ee3 Compare February 22, 2021 08:15
@nilason nilason marked this pull request as ready for review February 22, 2021 08:18
@nilason nilason changed the title WIP: Fix compiler warnings, part 10 Fix compiler warnings, part 10 Feb 22, 2021
@nilason
Copy link
Contributor Author

nilason commented Feb 22, 2021

I prefer to keep this code active as long as there is a reason to test for if (WEIGHTS[i][j] != -1.0)

Originally posted by @metzm in #1274 (comment)

I think you perhaps misread the code. By design WEIGHTS[i][j] may be -1.0 if map units is used (with -m flag) printed with ......:

grass/raster/r.fill.stats/r.fill.stats.html

Lines 300 to 310 in 4e7606f

If the distance is given in map units (flag <tt>-m</tt>), then the
search window can be modeled more accurately as a circle. The
illustration below shows the precomputed weights for a distance in map
units that is approximately equivalent to four cells from the center
cell:
<pre>
...... ...... ...... 000.00 000.00 000.00 ...... ...... ......
...... 000.00 000.02 000.06 000.09 000.06 000.02 000.00 ......
...... 000.02 000.11 000.22 000.28 000.22 000.11 000.02 ......
000.00 000.07 000.22 000.44 000.58 000.44 000.22 000.07 000.00

However, that part doesn't affect the troublesome snprintf call and its own if condition.

grass/raster/r.fill.stats/main.c

Lines 159 to 172 in 4e7606f

if (WEIGHTS[i][j] != -1.0) {
snprintf(weight_matrix_weight_buf, weight_matrix_line_length,
"%06.2f ", WEIGHTS[i][j]);
if (strlen(weight_matrix_weight_buf) >
(weight_matrix_weight_length)) {
snprintf(weight_matrix_weight_buf,
weight_matrix_line_length, "[????] ",
WEIGHTS[i][j]);
}
}
else {
snprintf(weight_matrix_weight_buf, weight_matrix_line_length,
"...... ");
}

The if condition on line 162-163 can by definition never be true, as the size of weight_matrix_weight_buf is set to weight_matrix_weight_length + 1.

I'm quite confident now this is dead code (L162-167) which can be removed all together. Pushed changes according to this.

@nilason nilason requested a review from metzm February 22, 2021 08:49
metzm
metzm reviewed Feb 26, 2021
View reviewed changes
metzm
metzm approved these changes Mar 7, 2021
View reviewed changes
Copy link
Contributor

@metzm metzm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The variable weight_matrix_weight_length needs to be removed in a separate PR.

@nilason nilason merged commit 3167aa8 into OSGeo:master Mar 8, 2021
@nilason
Copy link
Contributor Author

nilason commented Mar 8, 2021

@metzm Thanks!

@nilason nilason deleted the fix-compiler-warnings-10 branch March 11, 2021 19:56
marisn pushed a commit to marisn/grass that referenced this pull request Mar 22, 2021
@nilason @marisn
r.fill.stats: Remove dead code in matrix print (OSGeo#1395)
aa8b2b9 
The removed 'if' condition was never true and the faulty use
of snprintf was never reached.
@neteler neteler added this to the 8.0.0 milestone Dec 9, 2021
ninsbl pushed a commit to ninsbl/grass that referenced this pull request Oct 26, 2022
@nilason @ninsbl
r.fill.stats: Remove dead code in matrix print (OSGeo#1395)
cd99385 
The removed 'if' condition was never true and the faulty use
of snprintf was never reached.
ninsbl pushed a commit to ninsbl/grass that referenced this pull request Feb 17, 2023
@nilason @ninsbl
r.fill.stats: Remove dead code in matrix print (OSGeo#1395)
a2ffe2c 
The removed 'if' condition was never true and the faulty use
of snprintf was never reached.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@metzm metzm metzm approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

8.0.0

Development

Successfully merging this pull request may close these issues.

3 participants

@nilason @metzm @neteler