gbranden pushed a commit to branch master
in repository groff.
commit 3b40e8041e0fb93c297015f7bd271efb63869d74
Author: G. Branden Robinson <[email protected]>
AuthorDate: Wed Dec 17 15:57:58 2025 -0600
src/roff/troff/input.cpp: Fix code style nits.
* src/roff/troff/input.cpp (file_iterator::fill, file_iterator::peek):
Stop pointlessly constructing a new `int` from an existing one.
(file_iterator::fill): Arrange equality comparisons to avoid
inadvertent lvalue assignment.
---
ChangeLog | 8 ++++++++
src/roff/troff/input.cpp | 10 +++++-----
2 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index d4512dbd2..b3faa2ef6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2025-12-17 G. Branden Robinson <[email protected]>
+
+ * src/roff/troff/input.cpp: Fix code style nits.
+ (file_iterator::fill, file_iterator::peek): Stop pointlessly
+ constructing a new `int` from an existing one.
+ (file_iterator::fill): Arrange equality comparisons to avoid
+ inadvertent lvalue assignment.
+
2025-12-17 G. Branden Robinson <[email protected]>
* src/roff/troff/input.cpp (assign_control_character): Rename
diff --git a/src/roff/troff/input.cpp b/src/roff/troff/input.cpp
index 8e91bbffc..fdc92c55f 100644
--- a/src/roff/troff/input.cpp
+++ b/src/roff/troff/input.cpp
@@ -486,18 +486,18 @@ int file_iterator::fill(node **)
unsigned char *e = p + BUF_SIZE;
while (p < e) {
int c = getc(fp);
- if (c == EOF)
+ if (EOF == c)
break;
if (is_invalid_input_char(c))
- warning(WARN_INPUT, "invalid input character code %1", int(c));
+ warning(WARN_INPUT, "invalid input character code %1", c);
else {
*p++ = c;
- if (c == '\n') {
+ if ('\n' == c) {
seen_escape = false;
seen_newline = true;
break;
}
- seen_escape = (c == '\\');
+ seen_escape = ('\\' == c);
}
}
if (p > buf) {
@@ -514,7 +514,7 @@ int file_iterator::peek()
{
int c = getc(fp);
while (is_invalid_input_char(c)) {
- warning(WARN_INPUT, "invalid input character code %1", int(c));
+ warning(WARN_INPUT, "invalid input character code %1", c);
c = getc(fp);
}
if (c != EOF)
_______________________________________________
groff-commit mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/groff-commit
