SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use ASSERT_PTR() in more places

Browse Source
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2022-01-20 17:29:51 +01:00
parent 8513c34bec
commit 601dc59be2
2 changed files with 16 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/shared/install-printf.c
+6 -12
View File
@@ -14,12 +14,10 @@
#include "user-util.h"
static int specifier_prefix_and_instance(char specifier, const void *data, const char *root, const void *userdata, char **ret) {
const UnitFileInstallInfo *i = userdata;
const UnitFileInstallInfo *i = ASSERT_PTR(userdata);
_cleanup_free_ char *prefix = NULL;
int r;
assert(i);
r = unit_name_to_prefix_and_instance(i->name, &prefix);
if (r < 0)
return r;
@@ -38,11 +36,9 @@ static int specifier_prefix_and_instance(char specifier, const void *data, const
}
static int specifier_name(char specifier, const void *data, const char *root, const void *userdata, char **ret) {
const UnitFileInstallInfo *i = userdata;
const UnitFileInstallInfo *i = ASSERT_PTR(userdata);
char *ans;
assert(i);
if (unit_name_is_valid(i->name, UNIT_NAME_TEMPLATE) && i->default_instance)
return unit_name_replace_instance(i->name, i->default_instance, ret);
@@ -54,20 +50,16 @@ static int specifier_name(char specifier, const void *data, const char *root, co
}
static int specifier_prefix(char specifier, const void *data, const char *root, const void *userdata, char **ret) {
const UnitFileInstallInfo *i = userdata;
assert(i);
const UnitFileInstallInfo *i = ASSERT_PTR(userdata);
return unit_name_to_prefix(i->name, ret);
}
static int specifier_instance(char specifier, const void *data, const char *root, const void *userdata, char **ret) {
const UnitFileInstallInfo *i = userdata;
const UnitFileInstallInfo *i = ASSERT_PTR(userdata);
char *instance;
int r;
assert(i);
r = unit_name_to_instance(i->name, &instance);
if (r < 0)
return r;
@@ -87,6 +79,8 @@ static int specifier_last_component(char specifier, const void *data, const char
char *dash;
int r;
assert(ret);
r = specifier_prefix(specifier, data, root, userdata, &prefix);
if (r < 0)
return r;