gbranden pushed a commit to branch master
in repository groff.
commit bc61ccf4d689c4d5dd65d87ff8ef6c3b0cf634f1
Author: G. Branden Robinson <[email protected]>
AuthorDate: Wed Aug 14 12:33:16 2024 -0500
src/roff/troff/node.h: Annotate null ptr literals.
Annotate null pointers with `nullptr` comment to ease any future
transition to C++11, which defines it as a keyword.
---
src/roff/troff/node.cpp | 2 +-
src/roff/troff/node.h | 30 +++++++++++++++++-------------
2 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/src/roff/troff/node.cpp b/src/roff/troff/node.cpp
index 5236ccb77..2250f136b 100644
--- a/src/roff/troff/node.cpp
+++ b/src/roff/troff/node.cpp
@@ -3719,7 +3719,7 @@ int space_node::nbreaks()
static breakpoint *node_list_get_breakpoints(node *p, hunits *widthp,
int ns, breakpoint *rest)
{
- if (p != 0) {
+ if (p != 0 /* nullptr */) {
rest = p->get_breakpoints(*widthp,
ns,
node_list_get_breakpoints(p->next, widthp, ns,
diff --git a/src/roff/troff/node.h b/src/roff/troff/node.h
index 70fc6a58c..28bbf31ba 100644
--- a/src/roff/troff/node.h
+++ b/src/roff/troff/node.h
@@ -21,7 +21,8 @@ struct hyphen_list {
unsigned char breakable;
unsigned char hyphenation_code;
hyphen_list *next;
- hyphen_list(unsigned char code, hyphen_list * /* p */ = 0);
+ hyphen_list(unsigned char code,
+ hyphen_list * /* p */ = 0 /* nullptr */);
};
void hyphenate(hyphen_list *, unsigned);
@@ -119,32 +120,35 @@ struct node {
};
inline node::node()
-: next(0), last(0), state(0), push_state(0), div_nest_level(0),
- is_special(false)
+: next(0 /* nullptr */), last(0 /* nullptr */),
+ state(0 /* nullptr */), push_state(0 /* nullptr */),
+ div_nest_level(0), is_special(false)
{
}
inline node::node(node *n)
-: next(n), last(0), state(0), push_state(0), div_nest_level(0),
- is_special(false)
+: next(n), last(0 /* nullptr */),
+ state(0 /* nullptr */), push_state(0 /* nullptr */),
+ div_nest_level(0), is_special(false)
{
}
inline node::node(node *n, statem *s, int divlevel)
-: next(n), last(0), push_state(0), div_nest_level(divlevel),
- is_special(false)
+: next(n), last(0 /* nullptr */),
+ push_state(0 /* nullptr */),
+ div_nest_level(divlevel), is_special(false)
{
if (s)
state = new statem(s);
else
- state = 0;
+ state = 0 /* nullptr */;
}
inline node::~node()
{
- if (state != 0)
+ if (state != 0 /* nullptr */)
delete state;
- if (push_state != 0)
+ if (push_state != 0 /* nullptr */)
delete push_state;
}
@@ -325,7 +329,7 @@ protected:
unsigned char unformat;
color *col; /* for grotty */
public:
- hmotion_node(hunits i, color *c, node *nxt = 0)
+ hmotion_node(hunits i, color *c, node *nxt = 0 /* nullptr */)
: node(nxt), n(i), was_tab(0), unformat(0), col(c) {}
hmotion_node(hunits i, color *c, statem *s, int divlevel,
node *nxt = 0 /* nullptr */)
@@ -425,7 +429,7 @@ public:
class dummy_node : public node {
public:
- dummy_node(node * nd = 0) : node(nd) {}
+ dummy_node(node * nd = 0 /* nullptr */) : node(nd) {}
node *copy();
bool is_same_as(node *);
const char *type();
@@ -436,7 +440,7 @@ public:
class transparent_dummy_node : public node {
public:
- transparent_dummy_node(node * nd = 0) : node(nd) {}
+ transparent_dummy_node(node * nd = 0 /* nullptr */) : node(nd) {}
node *copy();
bool is_same_as(node *);
const char *type();
_______________________________________________
Groff-commit mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/groff-commit
