gbranden pushed a commit to branch master
in repository groff.
commit 2ac70f110ec931e47f88547ec8d1ea3b45ad7b4f
Author: G. Branden Robinson <[email protected]>
AuthorDate: Mon Dec 15 19:00:02 2025 -0600
src/roff/troff/env.cpp: Fix code style nits.
* src/roff/troff/env.cpp (override_available_type_sizes_request):
Arrange equality comparisons to avoid inadvertent lvalue assignment.
Parenthesize formally complex expressions.
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/env.cpp | 12 ++++++------
2 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 59781c949..7ac71a6e1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2025-12-15 G. Branden Robinson <[email protected]>
+
+ * src/roff/troff/env.cpp
+ (override_available_type_sizes_request): Fix code style nits.
+ Arrange equality comparisons to avoid inadvertent lvalue
+ assignment. Parenthesize formally complex expressions.
+
2025-12-13 G. Branden Robinson <[email protected]>
* src/roff/troff/input.cpp
diff --git a/src/roff/troff/env.cpp b/src/roff/troff/env.cpp
index df844cc42..386b12f48 100644
--- a/src/roff/troff/env.cpp
+++ b/src/roff/troff/env.cpp
@@ -1374,11 +1374,11 @@ static void override_available_type_sizes_request()
(void) memset(sizes, 0, (n * sizeof(int)));
int i = 0;
char *buf = read_rest_of_line_as_argument();
- if (!buf)
+ if (0 /* nullptr */ == buf)
return;
char *p = strtok(buf, " \t");
for (;;) {
- if (!p)
+ if (0 /* nullptr */ == p)
break;
int lower, upper;
switch (sscanf(p, "%d-%d", &lower, &upper)) {
@@ -1386,14 +1386,14 @@ static void override_available_type_sizes_request()
upper = lower;
// fall through
case 2:
- if (lower <= upper && lower >= 0)
+ if ((lower <= upper) && (lower >= 0))
break;
// fall through
default:
warning(WARN_RANGE, "invalid size range '%1'", p);
return;
}
- if (i + 2 > n) {
+ if ((i + 2) > n) {
int *old_sizes = sizes;
sizes = new int[n * 2]; // C++03: new int[n * 2]();
(void) memset(sizes, 0, (n * 2 * sizeof(int)));
@@ -1402,10 +1402,10 @@ static void override_available_type_sizes_request()
delete[] old_sizes;
}
sizes[i++] = lower;
- if (lower == 0)
+ if (0 == lower)
break;
sizes[i++] = upper;
- p = strtok(0, " \t");
+ p = strtok(0 /* nullptr */, " \t");
}
font_size::init_size_list(sizes);
tok.next();
_______________________________________________
groff-commit mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/groff-commit
