diff options
author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2022-01-19 18:09:22 +0100 |
---|---|---|
committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2022-01-20 17:29:51 +0100 |
commit | 601dc59be28275a0b4ac499dd0e72233d73b39d4 (patch) | |
tree | cca1c516b2216dcb27118659a9b51f90f486d788 /src/core/unit-printf.c | |
parent | 8513c34bece0b0cd69cb8669e4751f0cd3d28b7e (diff) | |
download | systemd-601dc59be28275a0b4ac499dd0e72233d73b39d4.tar.gz |
Use ASSERT_PTR() in more places
Diffstat (limited to 'src/core/unit-printf.c')
-rw-r--r-- | src/core/unit-printf.c | 41 |
1 files changed, 10 insertions, 31 deletions
diff --git a/src/core/unit-printf.c b/src/core/unit-printf.c index 46c383b841..774be7ba6f 100644 --- a/src/core/unit-printf.c +++ b/src/core/unit-printf.c @@ -13,28 +13,22 @@ #include "user-util.h" static int specifier_prefix_and_instance(char specifier, const void *data, const char *root, const void *userdata, char **ret) { - const Unit *u = userdata; - - assert(u); + const Unit *u = ASSERT_PTR(userdata); return unit_name_to_prefix_and_instance(u->id, ret); } static int specifier_prefix(char specifier, const void *data, const char *root, const void *userdata, char **ret) { - const Unit *u = userdata; - - assert(u); + const Unit *u = ASSERT_PTR(userdata); return unit_name_to_prefix(u->id, ret); } static int specifier_prefix_unescaped(char specifier, const void *data, const char *root, const void *userdata, char **ret) { _cleanup_free_ char *p = NULL; - const Unit *u = userdata; + const Unit *u = ASSERT_PTR(userdata); int r; - assert(u); - r = unit_name_to_prefix(u->id, &p); if (r < 0) return r; @@ -43,21 +37,17 @@ static int specifier_prefix_unescaped(char specifier, const void *data, const ch } static int specifier_instance_unescaped(char specifier, const void *data, const char *root, const void *userdata, char **ret) { - const Unit *u = userdata; - - assert(u); + const Unit *u = ASSERT_PTR(userdata); return unit_name_unescape(strempty(u->instance), ret); } static int specifier_last_component(char specifier, const void *data, const char *root, const void *userdata, char **ret) { - const Unit *u = userdata; + const Unit *u = ASSERT_PTR(userdata); _cleanup_free_ char *prefix = NULL; char *dash; int r; - assert(u); - r = unit_name_to_prefix(u->id, &prefix); if (r < 0) return r; @@ -82,9 +72,7 @@ static int specifier_last_component_unescaped(char specifier, const void *data, } static int specifier_filename(char specifier, const void *data, const char *root, const void *userdata, char **ret) { - const Unit *u = userdata; - - assert(u); + const Unit *u = ASSERT_PTR(userdata); if (u->instance) return unit_name_path_unescape(u->instance, ret); @@ -97,11 +85,9 @@ static void bad_specifier(const Unit *u, char specifier) { } static int specifier_cgroup(char specifier, const void *data, const char *root, const void *userdata, char **ret) { - const Unit *u = userdata; + const Unit *u = ASSERT_PTR(userdata); char *n; - assert(u); - bad_specifier(u, specifier); if (u->cgroup_path) @@ -116,11 +102,9 @@ static int specifier_cgroup(char specifier, const void *data, const char *root, } static int specifier_cgroup_root(char specifier, const void *data, const char *root, const void *userdata, char **ret) { - const Unit *u = userdata; + const Unit *u = ASSERT_PTR(userdata); char *n; - assert(u); - bad_specifier(u, specifier); n = strdup(u->manager->cgroup_root); @@ -132,11 +116,9 @@ static int specifier_cgroup_root(char specifier, const void *data, const char *r } static int specifier_cgroup_slice(char specifier, const void *data, const char *root, const void *userdata, char **ret) { - const Unit *u = userdata, *slice; + const Unit *u = ASSERT_PTR(userdata), *slice; char *n; - assert(u); - bad_specifier(u, specifier); slice = UNIT_GET_SLICE(u); @@ -155,11 +137,9 @@ static int specifier_cgroup_slice(char specifier, const void *data, const char * } static int specifier_special_directory(char specifier, const void *data, const char *root, const void *userdata, char **ret) { - const Unit *u = userdata; + const Unit *u = ASSERT_PTR(userdata); char *n = NULL; - assert(u); - n = strdup(u->manager->prefix[PTR_TO_UINT(data)]); if (!n) return -ENOMEM; @@ -169,7 +149,6 @@ static int specifier_special_directory(char specifier, const void *data, const c } int unit_name_printf(const Unit *u, const char* format, char **ret) { - /* * This will use the passed string as format string and replace the following specifiers (which should all be * safe for inclusion in unit names): |