From: David Tardon <dtardon@redhat.com>
Date: Fri, 14 Apr 2023 07:51:27 +0000 (+0200)
Subject: tree-wide: rename cleanup function
X-Git-Tag: v254-rc1~720^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=05cdf6a7013457ad2881eb6f2c49f5c4d26b7bce;p=thirdparty%2Fsystemd.git

tree-wide: rename cleanup function

... with accordance to the current coding style.
---

diff --git a/src/shared/install.c b/src/shared/install.c
index 604e7c63006..524ee187629 100644
--- a/src/shared/install.c
+++ b/src/shared/install.c
@@ -85,7 +85,7 @@ static void unit_file_preset_rule_done(UnitFilePresetRule *rule) {
         strv_free(rule->instances);
 }
 
-void unit_file_presets_freep(UnitFilePresets *p) {
+void unit_file_presets_done(UnitFilePresets *p) {
         if (!p)
                 return;
 
@@ -3220,7 +3220,7 @@ static int presets_find_config(RuntimeScope scope, const char *root_dir, char **
 }
 
 static int read_presets(RuntimeScope scope, const char *root_dir, UnitFilePresets *presets) {
-        _cleanup_(unit_file_presets_freep) UnitFilePresets ps = {};
+        _cleanup_(unit_file_presets_done) UnitFilePresets ps = {};
         _cleanup_strv_free_ char **files = NULL;
         int r;
 
@@ -3400,7 +3400,7 @@ static int query_presets(const char *name, const UnitFilePresets *presets, char
 }
 
 int unit_file_query_preset(RuntimeScope scope, const char *root_dir, const char *name, UnitFilePresets *cached) {
-        _cleanup_(unit_file_presets_freep) UnitFilePresets tmp = {};
+        _cleanup_(unit_file_presets_done) UnitFilePresets tmp = {};
         int r;
 
         if (!cached)
@@ -3526,7 +3526,7 @@ int unit_file_preset(
 
         _cleanup_(install_context_done) InstallContext plus = {}, minus = {};
         _cleanup_(lookup_paths_free) LookupPaths lp = {};
-        _cleanup_(unit_file_presets_freep) UnitFilePresets presets = {};
+        _cleanup_(unit_file_presets_done) UnitFilePresets presets = {};
         const char *config_path;
         int r;
 
@@ -3565,7 +3565,7 @@ int unit_file_preset_all(
 
         _cleanup_(install_context_done) InstallContext plus = {}, minus = {};
         _cleanup_(lookup_paths_free) LookupPaths lp = {};
-        _cleanup_(unit_file_presets_freep) UnitFilePresets presets = {};
+        _cleanup_(unit_file_presets_done) UnitFilePresets presets = {};
         const char *config_path = NULL;
         int r;
 
diff --git a/src/shared/install.h b/src/shared/install.h
index 2067969f833..9b27a046b9c 100644
--- a/src/shared/install.h
+++ b/src/shared/install.h
@@ -217,7 +217,7 @@ typedef struct {
         bool initialized;
 } UnitFilePresets;
 
-void unit_file_presets_freep(UnitFilePresets *p);
+void unit_file_presets_done(UnitFilePresets *p);
 int unit_file_query_preset(RuntimeScope scope, const char *root_dir, const char *name, UnitFilePresets *cached);
 
 const char *unit_file_state_to_string(UnitFileState s) _const_;
diff --git a/src/systemctl/systemctl-list-unit-files.c b/src/systemctl/systemctl-list-unit-files.c
index 69f0d977c1b..4b15e1ca6c3 100644
--- a/src/systemctl/systemctl-list-unit-files.c
+++ b/src/systemctl/systemctl-list-unit-files.c
@@ -51,7 +51,7 @@ static bool output_show_unit_file(const UnitFileList *u, char **states, char **p
 
 static int output_unit_file_list(const UnitFileList *units, unsigned c) {
         _cleanup_(table_unrefp) Table *table = NULL;
-        _cleanup_(unit_file_presets_freep) UnitFilePresets presets = {};
+        _cleanup_(unit_file_presets_done) UnitFilePresets presets = {};
         int r;
 
         table = table_new("unit file", "state", "preset");