gbranden pushed a commit to branch master
in repository groff.
commit 183b3128068a92c5c17a48055879d0035fc1b3b3
Author: G. Branden Robinson <[email protected]>
AuthorDate: Fri Feb 21 02:32:52 2025 -0600
[troff]: Fix code style nits.
* src/roff/troff/input.cpp (remove_character, get_optional_char)
(get_charinfo_by_number): Reorder equality comparison to avoid
inadvertent lvalue assignment. Explicitly compare variable of pointer
type to null pointer literal instead of letting it pun down to a
Boolean.
---
ChangeLog | 8 ++++++++
src/roff/troff/input.cpp | 8 ++++----
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 69476fc22..c3fbcd897 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2025-02-21 G. Branden Robinson <[email protected]>
+
+ * src/roff/troff/input.cpp (remove_character, get_optional_char)
+ (get_charinfo_by_number): Fix code style nits. Reorder equality
+ comparison to avoid inadvertent lvalue assignment. Explicitly
+ compare variable of pointer type to null pointer literal instead
+ of letting it pun down to a Boolean.
+
2025-02-21 G. Branden Robinson <[email protected]>
* src/roff/troff/input.cpp (token::next): Recast warning
diff --git a/src/roff/troff/input.cpp b/src/roff/troff/input.cpp
index 1eaf907f2..bdfe8c922 100644
--- a/src/roff/troff/input.cpp
+++ b/src/roff/troff/input.cpp
@@ -4715,7 +4715,7 @@ static void remove_character()
while (!tok.is_newline() && !tok.is_eof()) {
if (!tok.is_space() && !tok.is_tab()) {
charinfo *ci = tok.get_char(true /* required */);
- if (!ci)
+ if (0 /* nullptr */ == ci)
break;
macro *m = ci->set_macro(0 /* nullptr */);
if (m)
@@ -8183,7 +8183,7 @@ charinfo *get_optional_char()
while (tok.is_space())
tok.next();
charinfo *ci = tok.get_char();
- if (!ci)
+ if (0 /* nullptr */ == ci)
check_missing_character();
else
tok.next();
@@ -10215,7 +10215,7 @@ charinfo *get_charinfo_by_number(int n)
if (n >= 0 && n < 256) {
charinfo *ci = number_table[n];
- if (!ci) {
+ if (0 /*nullptr */ == ci) {
ci = new charinfo(UNNAMED_SYMBOL);
ci->set_number(n);
number_table[n] = ci;
@@ -10225,7 +10225,7 @@ charinfo *get_charinfo_by_number(int n)
else {
symbol ns(i_to_a(n));
charinfo *ci = (charinfo *)numbered_charinfo_dictionary.lookup(ns);
- if (!ci) {
+ if (0 /*nullptr */ == ci) {
ci = new charinfo(UNNAMED_SYMBOL);
ci->set_number(n);
(void) numbered_charinfo_dictionary.lookup(ns, ci);
_______________________________________________
groff-commit mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/groff-commit
