morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-14 08:25:20 +09:00
Code Issues Packages Projects Releases Wiki Activity

capability-util: drop _cleanup_cap_free_charp_

Browse Source 
Also moves cap_free_charpp() to test-cap-list.c, as it is used only
there.
This commit is contained in:
Yu Watanabe
2025-01-19 04:04:44 +09:00
parent fe5a1afb67
commit 43e95ddbf4
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/basic/capability-util.h
View File

@@ -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());
}

7
src/test/test-cap-list.c
View File

@@ -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;