gbranden pushed a commit to branch master
in repository groff.
commit f8b663759de821eaec3903281ce1cb74a48625cf
Author: G. Branden Robinson <[email protected]>
AuthorDate: Wed Apr 23 15:58:55 2025 -0500
[libgroff]: Fix code style nit (2/2).
* src/include/stringclass.h (operator+): Reorder equality comparisons to
avoid inadvertent lvalue assignment.
Also annotate null pointers with `nullptr` comment to ease any future
transition to C++11, which defines it as a keyword.
---
ChangeLog | 6 ++++++
src/include/stringclass.h | 6 ++++--
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 9ffd69877..a35e60c78 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2025-04-23 G. Branden Robinson <[email protected]>
+
+ * src/include/stringclass.h (operator+): Fix code style nit:
+ reorder equality comparisons to avoid inadvertent lvalue
+ assignment.
+
2025-04-23 G. Branden Robinson <[email protected]>
* src/include/stringclass.h (operator[], string::empty)
diff --git a/src/include/stringclass.h b/src/include/stringclass.h
index 35c0a46af..d23265f3b 100644
--- a/src/include/stringclass.h
+++ b/src/include/stringclass.h
@@ -138,12 +138,14 @@ inline string operator+(const string &s1, const string
&s2)
inline string operator+(const string &s1, const char *s2)
{
- return (s2 == 0) ? s1 : string(s1.ptr, s1.len, s2, strlen(s2));
+ return (0 /* nullptr */ == s2)
+ ? s1 : string(s1.ptr, s1.len, s2, strlen(s2));
}
inline string operator+(const char *s1, const string &s2)
{
- return (s1 == 0) ? s2 : string(s1, strlen(s1), s2.ptr, s2.len);
+ return (0 /* nullptr */ == s1)
+ ? s2 : string(s1, strlen(s1), s2.ptr, s2.len);
}
inline string operator+(const string &s, char c)
_______________________________________________
groff-commit mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/groff-commit
