gbranden pushed a commit to branch master
in repository groff.
commit 67650d1318b4d9816150eeb2dd04f59d7a965d7c
Author: G. Branden Robinson <[email protected]>
AuthorDate: Fri Jan 17 10:56:53 2025 -0600
src/roff/troff/input.cpp: Fix code style nits.
* src/roff/troff/input.cpp (define_character): 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.
Also annotate null pointers with `nullptr` comment to ease any future
transition to C++11, which defines it as a keyword.
---
ChangeLog | 7 +++++++
src/roff/troff/input.cpp | 4 ++--
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 64d00bc12..76f0cfef3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2025-01-17 G. Branden Robinson <[email protected]>
+
+ * src/roff/troff/input.cpp (define_character): 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-01-17 G. Branden Robinson <[email protected]>
[troff]: Trivially refactor. Rename character-definition
diff --git a/src/roff/troff/input.cpp b/src/roff/troff/input.cpp
index 1ca088a7c..3c2eb0b42 100644
--- a/src/roff/troff/input.cpp
+++ b/src/roff/troff/input.cpp
@@ -4542,11 +4542,11 @@ void define_character(char_mode mode, const char
*font_name)
int c;
tok.skip();
charinfo *ci = tok.get_char(true /* required */);
- if (ci == 0) {
+ if (0 /* nullptr */ == ci) {
skip_line();
return;
}
- if (font_name) {
+ if (font_name != 0 /* nullptr */) {
string s(font_name);
s += ' ';
s += ci->nm.contents();
_______________________________________________
groff-commit mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/groff-commit
