gbranden pushed a commit to branch master
in repository groff.
commit 85ceb6483fb7733d787b8993c2158f8658a8ea8c
Author: G. Branden Robinson <[email protected]>
AuthorDate: Sat Jun 20 05:32:42 2026 -0500
src/libs/libgroff/string.cpp: Trivially refactor.
* src/libs/libgroff/string.cpp (sfree_alloc): Rename this...
(sfree_and_alloc): ...to this.
(string::operator=(const char*), string::operator=(char) [0])
(string::move): Update call sites.
---
ChangeLog | 8 ++++++++
src/libs/libgroff/string.cpp | 12 ++++++------
2 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index b95383240..8da72abab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2026-06-20 G. Branden Robinson <[email protected]>
+
+ * src/libs/libgroff/string.cpp: Trivially refactor.
+ (sfree_alloc): Rename this...
+ (sfree_and_alloc): ...to this.
+ (string::operator=(const char*), string::operator=(char) [0])
+ (string::move): Update call sites.
+
2026-06-20 G. Branden Robinson <[email protected]>
* src/libs/libgroff/string.cpp (sfree_alloc): Avoid unnecessary
diff --git a/src/libs/libgroff/string.cpp b/src/libs/libgroff/string.cpp
index 90cae2f01..d27465bd1 100644
--- a/src/libs/libgroff/string.cpp
+++ b/src/libs/libgroff/string.cpp
@@ -69,8 +69,8 @@ static char *salloc(size_t len, size_t *sizep)
return p;
}
-static char *sfree_alloc(char *ptr, size_t oldsz, size_t len,
- size_t *sizep)
+static char *sfree_and_alloc(char *ptr, size_t oldsz, size_t len,
+ size_t *sizep)
{
if (oldsz >= len) {
*sizep = oldsz;
@@ -180,7 +180,7 @@ string::~string()
string &string::operator=(const string &s)
{
- ptr = sfree_alloc(ptr, sz, s.len, &sz);
+ ptr = sfree_and_alloc(ptr, sz, s.len, &sz);
assert(ptr != 0 /* nullptr */);
len = s.len;
if (len != 0)
@@ -194,7 +194,7 @@ string &string::operator=(const char *p)
if (0 /* nullptr */ == p)
p = "";
size_t slen = strlen(p);
- ptr = sfree_alloc(ptr, sz, slen, &sz);
+ ptr = sfree_and_alloc(ptr, sz, slen, &sz);
assert(ptr != 0 /* nullptr */);
len = slen;
if (len != 0)
@@ -204,7 +204,7 @@ string &string::operator=(const char *p)
string &string::operator=(char c)
{
- ptr = sfree_alloc(ptr, sz, 1, &sz);
+ ptr = sfree_and_alloc(ptr, sz, 1, &sz);
assert(ptr != 0 /* nullptr */);
len = 1;
*ptr = c;
@@ -213,7 +213,7 @@ string &string::operator=(char c)
void string::move(string &s)
{
- sfree_alloc(ptr, sz, s.len, &sz);
+ sfree_and_alloc(ptr, sz, s.len, &sz);
memcpy(ptr, s.ptr, s.len);
len = s.len;
s.clear();
_______________________________________________
groff-commit mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/groff-commit
