From cfb1a0e555051190d8fe57ddc795aca49dcda210 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Tue, 16 Feb 2021 17:05:42 +0100
Subject: [PATCH] Rename strbuf_cleanup to strbuf_free

It frees the whole object.
---
 src/basic/strbuf.c                  | 2 +-
 src/basic/strbuf.h                  | 4 ++--
 src/libsystemd/sd-hwdb/hwdb-util.c  | 2 +-
 src/libsystemd/sd-journal/catalog.c | 2 +-
 src/test/test-strbuf.c              | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/basic/strbuf.c b/src/basic/strbuf.c
index 535ac58bed2..212b561fa64 100644
--- a/src/basic/strbuf.c
+++ b/src/basic/strbuf.c
@@ -65,7 +65,7 @@ void strbuf_complete(struct strbuf *str) {
 }
 
 /* clean up everything */
-struct strbuf* strbuf_cleanup(struct strbuf *str) {
+struct strbuf* strbuf_free(struct strbuf *str) {
         if (!str)
                 return NULL;
 
diff --git a/src/basic/strbuf.h b/src/basic/strbuf.h
index 9a21438d640..6187c086832 100644
--- a/src/basic/strbuf.h
+++ b/src/basic/strbuf.h
@@ -35,5 +35,5 @@ struct strbuf_child_entry {
 struct strbuf* strbuf_new(void);
 ssize_t strbuf_add_string(struct strbuf *str, const char *s, size_t len);
 void strbuf_complete(struct strbuf *str);
-struct strbuf* strbuf_cleanup(struct strbuf *str);
-DEFINE_TRIVIAL_CLEANUP_FUNC(struct strbuf*, strbuf_cleanup);
+struct strbuf* strbuf_free(struct strbuf *str);
+DEFINE_TRIVIAL_CLEANUP_FUNC(struct strbuf*, strbuf_free);
diff --git a/src/libsystemd/sd-hwdb/hwdb-util.c b/src/libsystemd/sd-hwdb/hwdb-util.c
index 34be0e7fcc2..fd45ff0f548 100644
--- a/src/libsystemd/sd-hwdb/hwdb-util.c
+++ b/src/libsystemd/sd-hwdb/hwdb-util.c
@@ -120,7 +120,7 @@ static struct trie* trie_free(struct trie *trie) {
                 return NULL;
 
         trie_node_cleanup(trie->root);
-        strbuf_cleanup(trie->strings);
+        strbuf_free(trie->strings);
         return mfree(trie);
 }
 
diff --git a/src/libsystemd/sd-journal/catalog.c b/src/libsystemd/sd-journal/catalog.c
index 0f6ad8a29e8..aea3241d185 100644
--- a/src/libsystemd/sd-journal/catalog.c
+++ b/src/libsystemd/sd-journal/catalog.c
@@ -444,7 +444,7 @@ error:
 int catalog_update(const char* database, const char* root, const char* const* dirs) {
         _cleanup_strv_free_ char **files = NULL;
         char **f;
-        _cleanup_(strbuf_cleanupp) struct strbuf *sb = NULL;
+        _cleanup_(strbuf_freep) struct strbuf *sb = NULL;
         _cleanup_ordered_hashmap_free_free_free_ OrderedHashmap *h = NULL;
         _cleanup_free_ CatalogItem *items = NULL;
         ssize_t offset;
diff --git a/src/test/test-strbuf.c b/src/test/test-strbuf.c
index 867be19c860..0cdef3fb729 100644
--- a/src/test/test-strbuf.c
+++ b/src/test/test-strbuf.c
@@ -12,7 +12,7 @@ static ssize_t add_string(struct strbuf *sb, const char *s) {
 }
 
 static void test_strbuf(void) {
-        _cleanup_(strbuf_cleanupp) struct strbuf *sb;
+        _cleanup_(strbuf_freep) struct strbuf *sb;
         _cleanup_strv_free_ char **l;
         ssize_t a, b, c, d, e, f, g, h;
 
-- 
2.47.3