gbranden pushed a commit to branch master
in repository groff.
commit 32eb67495eaa3089ff1785a715edcf2b286b09be
Author: G. Branden Robinson <[email protected]>
AuthorDate: Mon May 25 01:49:11 2026 -0500
[tfmtodit]: Fix code style nits. (2/6)
* src/utils/tfmtodit/tfmtodit.cpp (tfm:load): Explicitly compare
variables of pointer type to null pointer literal instead of letting
them pun down to Booleans.
---
ChangeLog | 7 +++++++
src/utils/tfmtodit/tfmtodit.cpp | 12 ++++++++----
2 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 9e1cac76e..80b7f2b64 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2026-05-25 G. Branden Robinson <[email protected]>
+
+ * src/utils/tfmtodit/tfmtodit.cpp (tfm:load): Fix code style
+ nits. Parenthesize formally complex expressions. Explicitly
+ compare variables of pointer type to null pointer literal
+ instead of letting them pun down to Booleans.
+
2026-05-25 G. Branden Robinson <[email protected]>
* src/utils/tfmtodit/tfmtodit.cpp (kern_iterator::next)
diff --git a/src/utils/tfmtodit/tfmtodit.cpp b/src/utils/tfmtodit/tfmtodit.cpp
index 4ebb61e17..a603f42a5 100644
--- a/src/utils/tfmtodit/tfmtodit.cpp
+++ b/src/utils/tfmtodit/tfmtodit.cpp
@@ -649,7 +649,9 @@ int read_map(const char *file, char_list **table)
fclose(fp);
return 0;
}
- for (; ptr; ptr = strtok(0, " \n\t"))
+ for (;
+ ptr != 0 /* nullptr */;
+ ptr = strtok(0 /* nullptr */, " \n\t"))
table[n] = new char_list(ptr, table[n]);
}
fclose(fp);
@@ -853,8 +855,10 @@ int main(int argc, char **argv)
if (c2 != skewchar) {
k *= MULTIPLIER;
char_list *q = table[c2];
- for (char_list *p1 = table[c1]; p1; p1 = p1->next)
- for (char_list *p2 = q; p2; p2 = p2->next) {
+ for (char_list *p1 = table[c1];
+ p1 != 0 /* nullptr */;
+ p1 = p1->next)
+ for (char_list *p2 = q; p2 != 0 /* nullptr */; p2 = p2->next) {
if (!had_kern) {
printf("kernpairs\n");
had_kern = 1;
@@ -887,7 +891,7 @@ int main(int argc, char **argv)
if (m[1] > xheight)
type += 2;
printf("\t%d\t%04o\n", type, i);
- for (p = p->next; p; p = p->next)
+ for (p = p->next; p != 0 /* nullptr */; p = p->next)
printf("%s\t\"\n", p->ch);
}
return 0;
_______________________________________________
groff-commit mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/groff-commit
