gbranden pushed a commit to branch master
in repository groff.
commit ab93210e361b2e7b6cb1dcccad7bb584034962a9
Author: G. Branden Robinson <[email protected]>
AuthorDate: Fri Aug 16 19:32:18 2024 -0500
src/roff/troff/reg.cpp: Fix code style nits.
* src/roff/troff/reg.cpp (number_value_to_ascii): Add parentheses to
complex expressions.
(number_value_to_ascii): Assign character, not integer, literal to
element of array of `char` type.
(inline_define_register [0], define_register, set_register)
(look_up_register, alter_format): Use `static_cast` instead of C-style
cast on dictionary values.
(inline_define_register [0], define_register, set_register)
(look_up_register, alter_format): Reorder equality comparisons to
avoid inadvertent lvalue assignment.
Use `sizeof` operator idiomatically; it is an operator, not a function,
and should be followed by parentheses only when making it operate on a
type cast to get the size of a non-lvalue.
Annotate null pointers with `nullptr` comment to ease any future
transition to C++11, which defines it as a keyword.
---
ChangeLog | 15 +++++++++++++++
src/roff/troff/reg.cpp | 40 ++++++++++++++++++++--------------------
2 files changed, 35 insertions(+), 20 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 23fab9a29..da2ee827a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2024-08-16 G. Branden Robinson <[email protected]>
+
+ [troff]: Fix code style nits.
+
+ * src/roff/troff/reg.cpp (number_value_to_ascii): Add
+ parentheses to complex expressions.
+ (number_value_to_ascii): Assign character, not integer, literal
+ to element of array of `char` type.
+ (inline_define_register [0], define_register, set_register)
+ (look_up_register, alter_format): Use `static_cast` instead of
+ C-style cast on dictionary values.
+ (inline_define_register [0], define_register, set_register)
+ (look_up_register, alter_format): Reorder equality comparisons
+ to avoid inadvertent lvalue assignment.
+
2024-08-15 G. Branden Robinson <[email protected]>
[troff]: Clear array memory when allocating it from the heap.
diff --git a/src/roff/troff/reg.cpp b/src/roff/troff/reg.cpp
index 40881c007..e6b85217f 100644
--- a/src/roff/troff/reg.cpp
+++ b/src/roff/troff/reg.cpp
@@ -91,8 +91,8 @@ static const char *number_value_to_ascii(int value, char
format,
case '1':
if (width <= 0)
return i_to_a(value);
- else if (width > int(sizeof(buf) - 2))
- sprintf(buf, "%.*d", int(sizeof(buf) - 2), int(value));
+ else if (width > int((sizeof buf) - 2))
+ sprintf(buf, "%.*d", int((sizeof buf) - 2), int(value));
else
sprintf(buf, "%.*d", width, int(value));
break;
@@ -110,7 +110,7 @@ static const char *number_value_to_ascii(int value, char
format,
}
if (n == 0) {
*p++ = '0';
- *p = 0;
+ *p = '\0';
break;
}
if (n < 0) {
@@ -161,7 +161,7 @@ static const char *number_value_to_ascii(int value, char
format,
*p++ = s[0];
}
}
- *p = 0;
+ *p = '\0';
break;
}
case 'a':
@@ -171,7 +171,7 @@ static const char *number_value_to_ascii(int value, char
format,
char *p = buf;
if (n == 0) {
*p++ = '0';
- *p = 0;
+ *p = '\0';
}
else {
if (n < 0) {
@@ -188,7 +188,7 @@ static const char *number_value_to_ascii(int value, char
format,
*p++ = format == 'a' ? lowercase_array[d - 1] :
uppercase_array[d - 1];
}
- *p-- = 0;
+ *p-- = '\0';
char *q = buf[0] == '-' ? buf + 1 : buf;
while (q < p) {
char temp = *q;
@@ -247,8 +247,8 @@ static const char *number_format_to_ascii(char format, int
width)
if (format == '1') {
if (width > 0) {
int n = width;
- if (n > int(sizeof(buf)) - 1)
- n = int(sizeof(buf)) - 1;
+ if (n > int(sizeof buf) - 1)
+ n = int(sizeof buf) - 1;
sprintf(buf, "%.*d", n, 0);
return buf;
}
@@ -312,13 +312,13 @@ void define_register()
skip_line();
return;
}
- reg *r = (reg *)register_dictionary.lookup(nm);
+ reg *r = static_cast<reg *>(register_dictionary.lookup(nm));
units v;
units prev_value;
- if (!r || !r->get_value(&prev_value))
+ if ((0 /* nullptr */ == r) || !r->get_value(&prev_value))
prev_value = 0;
if (get_number(&v, 'u', prev_value)) {
- if (r == 0) {
+ if (0 /* nullptr */ == r) {
r = new number_reg;
register_dictionary.define(nm, r);
}
@@ -340,14 +340,14 @@ void inline_define_register()
symbol nm = get_name(true /* required */);
if (nm.is_null())
return;
- reg *r = (reg *)register_dictionary.lookup(nm);
- if (r == 0) {
+ reg *r = static_cast<reg *>(register_dictionary.lookup(nm));
+ if (0 /* nullptr */ == r) {
r = new number_reg;
register_dictionary.define(nm, r);
}
units v;
units prev_value;
- if (!r->get_value(&prev_value))
+ if ((0 /* nullptr */ == r) || !r->get_value(&prev_value))
prev_value = 0;
if (get_number(&v, 'u', prev_value)) {
r->set_value(v);
@@ -364,8 +364,8 @@ void inline_define_register()
void set_register(symbol nm, units n)
{
- reg *r = (reg *)register_dictionary.lookup(nm);
- if (r == 0) {
+ reg *r = static_cast<reg *>(register_dictionary.lookup(nm));
+ if (0 /* nullptr */ == r) {
r = new number_reg;
register_dictionary.define(nm, r);
}
@@ -374,8 +374,8 @@ void set_register(symbol nm, units n)
reg *look_up_register(symbol nm)
{
- reg *r = (reg *)register_dictionary.lookup(nm);
- if (r == 0) {
+ reg *r = static_cast<reg *>(register_dictionary.lookup(nm));
+ if (0 /* nullptr */ == r) {
warning(WARN_REG, "register '%1' not defined", nm.contents());
r = new number_reg;
register_dictionary.define(nm, r);
@@ -390,8 +390,8 @@ void alter_format()
skip_line();
return;
}
- reg *r = (reg *)register_dictionary.lookup(nm);
- if (r == 0) {
+ reg *r = static_cast<reg *>(register_dictionary.lookup(nm));
+ if (0 /* nullptr */ == r) {
r = new number_reg;
register_dictionary.define(nm, r);
}
_______________________________________________
Groff-commit mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/groff-commit
