gbranden pushed a commit to branch master
in repository groff.
commit 57965bfdc322ef244aaff84a1b20e1b1974d411a
Author: G. Branden Robinson <[email protected]>
AuthorDate: Wed Aug 21 07:24:55 2024 -0500
src/roff/troff/env.cpp: Fix code style nit.
* src/roff/troff/env.cpp (environment::add_char): Declare local variable
closer to point of use. It's also a dead store, but demanded by our
internal API. (See `node::add_char()` in "node.cpp".) Prompted by a
report by Lukas Javorsky involving use of "SAST analyzers {combination
of coverity, snyk, cppcheck, gcc, clang, shellcheck, unicontrol}".
Also see <https://savannah.gnu.org/bugs/?66079>.
---
ChangeLog | 11 +++++++++++
src/roff/troff/env.cpp | 8 +++++---
2 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index eccc3fbab..747e23d81 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2024-08-21 G. Branden Robinson <[email protected]>
+
+ * src/roff/troff/env.cpp (environment::add_char): Declare local
+ variable closer to point of use. It's also a dead store, but
+ demanded by our internal API. (See `node::add_char()` in
+ "node.cpp".) Prompted by a report by Lukas Javorsky involving
+ use of "SAST analyzers {combination of coverity, snyk, cppcheck,
+ gcc, clang, shellcheck, unicontrol}".
+
+ Also see <https://savannah.gnu.org/bugs/?66079>.
+
2024-08-20 G. Branden Robinson <[email protected]>
* src/roff/troff/input.cpp (get_delimited_name, do_if_request)
diff --git a/src/roff/troff/env.cpp b/src/roff/troff/env.cpp
index c3990f040..fa86b0504 100644
--- a/src/roff/troff/env.cpp
+++ b/src/roff/troff/env.cpp
@@ -296,7 +296,6 @@ void leader_character()
void environment::add_char(charinfo *ci)
{
- int s;
node *gc_np = 0 /* nullptr */;
if (line_interrupted)
;
@@ -312,8 +311,11 @@ void environment::add_char(charinfo *ci)
else if (current_tab != TAB_NONE) {
if (tab_contents == 0 /* nullptr */)
tab_contents = new line_start_node;
- if (ci != hyphen_indicator_char)
- tab_contents = tab_contents->add_char(ci, this, &tab_width, &s, &gc_np);
+ if (ci != hyphen_indicator_char) {
+ int s;
+ tab_contents = tab_contents->add_char(ci, this, &tab_width, &s,
+ &gc_np);
+ }
else
tab_contents = tab_contents->add_discretionary_hyphen();
}
_______________________________________________
Groff-commit mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/groff-commit
