gbranden pushed a commit to branch master
in repository groff.
commit 6130262c2cd88b43dac2d43e660e42e00e2c3752
Author: G. Branden Robinson <[email protected]>
AuthorDate: Wed Jun 4 05:45:08 2025 -0500
[libdriver]: Fix code style nits.
* src/libs/libdriver/printer.cpp: Fix code style nits.
(printer::load_font): Reorder equality comparison to avoid inadvertent
lvalue assignment.
(printer::set_ascii_char, printer::set_special_char)
(printer::set_char_and_width, printer::set_numbered_char): Explicitly
compare value of pointer type to null pointer literal instead of
letting it pun down to a Boolean.
(printer::set_char_and_width, printer::set_numbered_char):
Parenthesize formally complex expressions.
---
ChangeLog | 12 ++++++++++++
src/libs/libdriver/printer.cpp | 34 +++++++++++++++++-----------------
2 files changed, 29 insertions(+), 17 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 1dbbb3b71..231af72c1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2025-06-04 G. Branden Robinson <[email protected]>
+
+ * src/libs/libdriver/printer.cpp: Fix code style nits.
+ (printer::load_font): Reorder equality comparison to avoid
+ inadvertent lvalue assignment.
+ (printer::set_ascii_char, printer::set_special_char)
+ (printer::set_char_and_width, printer::set_numbered_char):
+ Explicitly compare value of pointer type to null pointer literal
+ instead of letting it pun down to a Boolean.
+ (printer::set_char_and_width, printer::set_numbered_char):
+ Parenthesize formally complex expressions.
+
2025-06-04 G. Branden Robinson <[email protected]>
* src/roff/troff/node.cpp (mount_font_at_position)
diff --git a/src/libs/libdriver/printer.cpp b/src/libs/libdriver/printer.cpp
index 981aec99a..171a8a9b5 100644
--- a/src/libs/libdriver/printer.cpp
+++ b/src/libs/libdriver/printer.cpp
@@ -84,7 +84,7 @@ font_pointer_list::font_pointer_list(font *f,
font_pointer_list *fp)
}
printer::printer()
-: font_list(0), font_table(0), nfonts(0)
+: font_list(0 /* nullptr */), font_table(0 /* nullptr */), nfonts(0)
{
}
@@ -105,13 +105,13 @@ void printer::load_font(int n, const char *nm)
{
assert(n >= 0);
if (n >= nfonts) {
- if (nfonts == 0) {
+ if (0 == nfonts) {
nfonts = 10;
if (nfonts <= n)
nfonts = n + 1;
font_table = new font *[nfonts];
for (int i = 0; i < nfonts; i++)
- font_table[i] = 0;
+ font_table[i] = 0 /* nullptr */;
}
else {
font **old_font_table = font_table;
@@ -124,7 +124,7 @@ void printer::load_font(int n, const char *nm)
for (i = 0; i < old_nfonts; i++)
font_table[i] = old_font_table[i];
for (i = old_nfonts; i < nfonts; i++)
- font_table[i] = 0;
+ font_table[i] = 0 /* nullptr */;
delete[] old_font_table;
}
}
@@ -173,7 +173,7 @@ void printer::change_fill_color(const environment * const)
{
}
-void printer::set_ascii_char(unsigned char c, const environment *env,
+void printer::set_ascii_char(unsigned char c, const environment *env,
int *widthp)
{
char buf[2];
@@ -186,8 +186,8 @@ void printer::set_ascii_char(unsigned char c, const
environment *env,
glyph *g = set_char_and_width(buf, env, &w, &f);
if (g != UNDEFINED_GLYPH) {
- set_char(g, f, env, w, 0);
- if (widthp)
+ set_char(g, f, env, w, 0 /* nullptr */);
+ if (widthp != 0 /* nullptr */)
*widthp = w;
}
}
@@ -200,7 +200,7 @@ void printer::set_special_char(const char *nm, const
environment *env,
glyph *g = set_char_and_width(nm, env, &w, &f);
if (g != UNDEFINED_GLYPH) {
set_char(g, f, env, w, nm);
- if (widthp)
+ if (widthp != 0 /* nullptr */)
*widthp = w;
}
}
@@ -211,17 +211,17 @@ glyph *printer::set_char_and_width(const char *nm,
{
glyph *g = name_to_glyph(nm);
int fn = env->fontno;
- if (fn < 0 || fn >= nfonts) {
+ if ((fn < 0) || (fn >= nfonts)) {
error("invalid font position '%1'", fn);
return UNDEFINED_GLYPH;
}
*f = font_table[fn];
- if (*f == 0) {
+ if (0 /* nullptr */ == *f) {
error("no font mounted at position %1", fn);
return UNDEFINED_GLYPH;
}
if (!(*f)->contains(g)) {
- if (nm[0] != '\0' && nm[1] == '\0')
+ if ((nm[0] != '\0') && ('\0' == nm[1]))
error("font '%1' does not contain ordinary character '%2'",
(*f)->get_name(), nm[0]);
else
@@ -230,7 +230,7 @@ glyph *printer::set_char_and_width(const char *nm,
return UNDEFINED_GLYPH;
}
int w = (*f)->get_width(g, env->size);
- if (widthp)
+ if (widthp != 0 /* nullptr */)
*widthp = w;
return g;
}
@@ -240,12 +240,12 @@ void printer::set_numbered_char(int num, const
environment *env, int
{
glyph *g = number_to_glyph(num);
int fn = env->fontno;
- if (fn < 0 || fn >= nfonts) {
+ if ((fn < 0) || (fn >= nfonts)) {
error("invalid font position '%1'", fn);
return;
}
font *f = font_table[fn];
- if (f == 0) {
+ if (0 /* nullptr */ == f) {
error("no font mounted at position %1", fn);
return;
}
@@ -254,9 +254,9 @@ void printer::set_numbered_char(int num, const environment
*env, int
return;
}
int w = f->get_width(g, env->size);
- if (widthp)
+ if (widthp != 0 /* nullptr */)
*widthp = w;
- set_char(g, f, env, w, 0);
+ set_char(g, f, env, w, 0 /* nullptr */);
}
font *printer::get_font_from_index(int fontno)
@@ -264,7 +264,7 @@ font *printer::get_font_from_index(int fontno)
if ((fontno >= 0) && (fontno < nfonts))
return font_table[fontno];
else
- return 0;
+ return 0 /* nullptr */;
}
// Local Variables:
_______________________________________________
groff-commit mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/groff-commit
