capability-util: drop _cleanup_cap_free_charp_

Also moves cap_free_charpp() to test-cap-list.c, as it is used only
there.

diff --git a/src/basic/capability-util.h b/src/basic/capability-util.h
index 89c6cbec4149d6df810379f6a5c901e855fb1a12..16dc8d18128ac16e12d3cb9802529be67381738a 100644 (file)
--- a/src/basic/capability-util.h
+++ b/src/basic/capability-util.h
@@ -43,12 +43,6 @@ int keep_capability(cap_value_t cv);
 DEFINE_TRIVIAL_CLEANUP_FUNC_FULL(cap_t, cap_free, NULL);
 #define _cleanup_cap_free_ _cleanup_(cap_freep)
 
-static inline void cap_free_charpp(char **p) {
-        if (*p)
-                cap_free(*p);
-}
-#define _cleanup_cap_free_charp_ _cleanup_(cap_free_charpp)
-
 static inline uint64_t all_capabilities(void) {
         return UINT64_MAX >> (63 - cap_last_cap());
 }

diff --git a/src/test/test-cap-list.c b/src/test/test-cap-list.c
index 49be4a2d2722bd2fa4121ba1a907821803f838a3..0fb2f31ed2795bdfc9ae30d4e28f364a391583aa 100644 (file)
--- a/src/test/test-cap-list.c
+++ b/src/test/test-cap-list.c
@@ -12,6 +12,11 @@
 #include "strv.h"
 #include "tests.h"
 
+static inline void cap_free_charpp(char **p) {
+        if (*p)
+                cap_free(*p);
+}
+
 /* verify the capability parser */
 TEST(cap_list) {
         assert_se(!capability_to_name(-1));
@@ -46,7 +51,7 @@ TEST(cap_list) {
         assert_se(capability_from_name("-1") == -EINVAL);
 
         for (int i = 0; i < capability_list_length(); i++) {
-                _cleanup_cap_free_charp_ char *a = NULL;
+                _cleanup_(cap_free_charpp) char *a = NULL;
                 const char *b;
                 unsigned u;