From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Mon, 14 May 2018 05:13:57 +0000 (+0900)
Subject: core: use _cleanup_set_free_ instread of _cleanup_(set_freep)
X-Git-Tag: v239~260^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=af4fa99d6ad93db5a34f857bfb6f47b40e0e0862;p=thirdparty%2Fsystemd.git

core: use _cleanup_set_free_ instread of _cleanup_(set_freep)
---

diff --git a/src/core/dbus-unit.c b/src/core/dbus-unit.c
index 34024885008..0efba47b1c5 100644
--- a/src/core/dbus-unit.c
+++ b/src/core/dbus-unit.c
@@ -928,7 +928,7 @@ static int append_cgroup(sd_bus_message *reply, const char *p, Set *pids) {
 
 int bus_unit_method_get_processes(sd_bus_message *message, void *userdata, sd_bus_error *error) {
         _cleanup_(sd_bus_message_unrefp) sd_bus_message *reply = NULL;
-        _cleanup_(set_freep) Set *pids = NULL;
+        _cleanup_set_free_ Set *pids = NULL;
         Unit *u = userdata;
         pid_t pid;
         int r;
@@ -1015,7 +1015,7 @@ static int property_get_ip_counter(
 int bus_unit_method_attach_processes(sd_bus_message *message, void *userdata, sd_bus_error *error) {
 
         _cleanup_(sd_bus_creds_unrefp) sd_bus_creds *creds = NULL;
-        _cleanup_(set_freep) Set *pids = NULL;
+        _cleanup_set_free_ Set *pids = NULL;
         Unit *u = userdata;
         const char *path;
         int r;
diff --git a/src/core/device.c b/src/core/device.c
index 0bf329c3d24..3387820a6db 100644
--- a/src/core/device.c
+++ b/src/core/device.c
@@ -704,7 +704,7 @@ static Unit *device_following(Unit *u) {
 
 static int device_following_set(Unit *u, Set **_set) {
         Device *d = DEVICE(u), *other;
-        _cleanup_(set_freep) Set *set = NULL;
+        _cleanup_set_free_ Set *set = NULL;
         int r;
 
         assert(d);
diff --git a/src/core/swap.c b/src/core/swap.c
index 965d96f4da1..618a8d553dc 100644
--- a/src/core/swap.c
+++ b/src/core/swap.c
@@ -1240,7 +1240,7 @@ static Unit *swap_following(Unit *u) {
 
 static int swap_following_set(Unit *u, Set **_set) {
         Swap *s = SWAP(u), *other;
-        _cleanup_(set_freep) Set *set = NULL;
+        _cleanup_set_free_ Set *set = NULL;
         int r;
 
         assert(s);
diff --git a/src/core/unit.c b/src/core/unit.c
index 5b7beca369e..13e00a25c82 100644
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -3815,7 +3815,7 @@ int unit_kill(Unit *u, KillWho w, int signo, sd_bus_error *error) {
 }
 
 static Set *unit_pid_set(pid_t main_pid, pid_t control_pid) {
-        _cleanup_(set_freep) Set *pid_set = NULL;
+        _cleanup_set_free_ Set *pid_set = NULL;
         int r;
 
         pid_set = set_new(NULL);