gbranden pushed a commit to branch master
in repository groff.
commit 99fb7808995d5d0e4460ee762f652a329dc255dc
Author: G. Branden Robinson <[email protected]>
AuthorDate: Thu May 15 12:52:24 2025 -0500
src/roff/troff/input.cpp: Fix code style nit.
* src/roff/troff/input.cpp (do_translate): Fix code style nit. Reorder
equality comparisons to avoid inadvertent lvalue assignment.
Also annotate null pointers with `nullptr` comment to ease any future
transition to C++11, which defines it as a keyword.
Also wrap long source lines.
---
ChangeLog | 6 ++++++
src/roff/troff/input.cpp | 10 ++++++----
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index de98b363e..de5eac7ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2025-05-15 G. Branden Robinson <[email protected]>
+
+ * src/roff/troff/input.cpp (do_translate): Fix code style nit.
+ Reorder equality comparisons to avoid inadvertent lvalue
+ assignment.
+
2025-05-15 G. Branden Robinson <[email protected]>
* src/roff/troff/input.cpp (charinfo::charinfo)
diff --git a/src/roff/troff/input.cpp b/src/roff/troff/input.cpp
index 3c2335e53..d2eff7c93 100644
--- a/src/roff/troff/input.cpp
+++ b/src/roff/troff/input.cpp
@@ -7996,7 +7996,7 @@ static void do_translate(int translate_transparent, int
translate_input)
continue;
}
charinfo *ci1 = tok.get_char(true /* required */);
- if (ci1 == 0)
+ if (0 /* nullptr */ == ci1)
break;
tok.next();
if (tok.is_newline() || tok.is_eof()) {
@@ -8018,12 +8018,14 @@ static void do_translate(int translate_transparent, int
translate_input)
translate_transparent);
else {
charinfo *ci2 = tok.get_char(true /* required */);
- if (ci2 == 0)
+ if (0 /* nullptr */ == ci2)
break;
if (ci1 == ci2)
- ci1->set_translation(0, translate_transparent, translate_input);
+ ci1->set_translation(0 /* nullptr */, translate_transparent,
+ translate_input);
else
- ci1->set_translation(ci2, translate_transparent, translate_input);
+ ci1->set_translation(ci2, translate_transparent,
+ translate_input);
}
tok.next();
}
_______________________________________________
groff-commit mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/groff-commit
