From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Sat, 25 Oct 2025 02:23:20 +0000 (+0900)
Subject: libarchive-util: drop 'sym_' prefix from cleanup functions
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fc945d22d5a6f80507ef3bdfa9e452ef07781a09;p=thirdparty%2Fsystemd.git

libarchive-util: drop 'sym_' prefix from cleanup functions
---

diff --git a/src/dissect/dissect.c b/src/dissect/dissect.c
index ca69b36c228..51b2ac40bc6 100644
--- a/src/dissect/dissect.c
+++ b/src/dissect/dissect.c
@@ -1455,7 +1455,7 @@ static int archive_item(
 
         log_debug("Archiving %s\n", path);
 
-        _cleanup_(sym_archive_entry_freep) struct archive_entry *entry = NULL;
+        _cleanup_(archive_entry_freep) struct archive_entry *entry = NULL;
         entry = sym_archive_entry_new();
         if (!entry)
                 return log_oom();
@@ -1744,7 +1744,7 @@ static int action_list_or_mtree_or_copy_or_make_archive(DissectedImage *m, LoopD
                 if (dfd < 0)
                         return log_error_errno(errno, "Failed to open mount directory: %m");
 
-                _cleanup_(sym_archive_write_freep) struct archive *a = sym_archive_write_new();
+                _cleanup_(archive_write_freep) struct archive *a = sym_archive_write_new();
                 if (!a)
                         return log_oom();
 
diff --git a/src/shared/libarchive-util.h b/src/shared/libarchive-util.h
index 7d4ba3b6ba9..83ee19d27a5 100644
--- a/src/shared/libarchive-util.h
+++ b/src/shared/libarchive-util.h
@@ -77,9 +77,9 @@ static inline int sym_archive_entry_hardlink_is_set(struct archive_entry *e) {
 
 int dlopen_libarchive(void);
 
-DEFINE_TRIVIAL_CLEANUP_FUNC_FULL(struct archive_entry*, sym_archive_entry_free, NULL);
-DEFINE_TRIVIAL_CLEANUP_FUNC_FULL(struct archive*, sym_archive_write_free, NULL);
-DEFINE_TRIVIAL_CLEANUP_FUNC_FULL(struct archive*, sym_archive_read_free, NULL);
+DEFINE_TRIVIAL_CLEANUP_FUNC_FULL_RENAME(struct archive_entry*, sym_archive_entry_free, archive_entry_freep, NULL);
+DEFINE_TRIVIAL_CLEANUP_FUNC_FULL_RENAME(struct archive*, sym_archive_write_free, archive_write_freep, NULL);
+DEFINE_TRIVIAL_CLEANUP_FUNC_FULL_RENAME(struct archive*, sym_archive_read_free, archive_read_freep, NULL);
 
 #else
 
diff --git a/src/shared/tar-util.c b/src/shared/tar-util.c
index 6eb3a2baadb..135ff28a114 100644
--- a/src/shared/tar-util.c
+++ b/src/shared/tar-util.c
@@ -392,7 +392,7 @@ int tar_x(int input_fd, int tree_fd, TarFlags flags) {
         assert(input_fd >= 0);
         assert(tree_fd >= 0);
 
-        _cleanup_(sym_archive_read_freep) struct archive *a = NULL;
+        _cleanup_(archive_read_freep) struct archive *a = NULL;
         a = sym_archive_read_new();
         if (!a)
                 return log_oom();