shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-12-23 17:34:00 +03:00
Code

shared/install: stop passing duplicate root argument to install_name_printf()

Browse Source 
All callers were just passing info + info->root, we can simplify this.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2022-03-17 10:16:30 +01:00
parent 466f6979c9
commit 38e8a6c7fd
4 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/shared/install-printf.c
View File

@ -99,9 +99,8 @@ static int specifier_last_component(char specifier, const void *data, const char
int install_name_printf(
UnitFileScope scope,
const UnitFileInstallInfo *i,
const UnitFileInstallInfo *info,
const char *format,
const char *root,
char **ret) {
/* This is similar to unit_name_printf() */
@ -118,9 +117,9 @@ int install_name_printf(
{}
};
assert(i);
assert(info);
assert(format);
assert(ret);
return specifier_printf(format, UNIT_NAME_MAX, table, root, i, ret);
return specifier_printf(format, UNIT_NAME_MAX, table, info->root, info, ret);
}

3
src/shared/install-printf.h
View File

@ -6,7 +6,6 @@
int install_name_printf(
UnitFileScope scope,
const UnitFileInstallInfo *i,
const UnitFileInstallInfo *info,
const char *format,
const char *root,
char **ret);

8
src/shared/install.c
View File

@ -1203,7 +1203,7 @@ static int config_parse_also(
if (r == 0)
break;
r = install_name_printf(ctx->scope, info, word, info->root, &printed);
r = install_name_printf(ctx->scope, info, word, &printed);
if (r < 0)
return log_syntax(unit, LOG_WARNING, filename, line, r,
"Failed to resolve unit name in Also=\"%s\": %m", word);
@ -1252,7 +1252,7 @@ static int config_parse_default_instance(
return log_syntax(unit, LOG_WARNING, filename, line, 0,
"DefaultInstance= only makes sense for template units, ignoring.");
r = install_name_printf(ctx->scope, info, rvalue, info->root, &printed);
r = install_name_printf(ctx->scope, info, rvalue, &printed);
if (r < 0)
return log_syntax(unit, LOG_WARNING, filename, line, r,
"Failed to resolve instance name in DefaultInstance=\"%s\": %m", rvalue);
@ -1845,7 +1845,7 @@ static int install_info_symlink_alias(
STRV_FOREACH(s, info->aliases) {
_cleanup_free_ char *alias_path = NULL, *dst = NULL, *dst_updated = NULL;
q = install_name_printf(scope, info, *s, info->root, &dst);
q = install_name_printf(scope, info, *s, &dst);
if (q < 0) {
unit_file_changes_add(changes, n_changes, q, *s, NULL);
r = r < 0 ? r : q;
@ -1935,7 +1935,7 @@ static int install_info_symlink_wants(
STRV_FOREACH(s, list) {
_cleanup_free_ char *dst = NULL;
q = install_name_printf(scope, info, *s, info->root, &dst);
q = install_name_printf(scope, info, *s, &dst);
if (q < 0) {
unit_file_changes_add(changes, n_changes, q, *s, NULL);
return q;

2
src/test/test-load-fragment.c
View File

@ -515,7 +515,7 @@ TEST(install_printf, .sd_booted = true) {
_cleanup_free_ char *t = NULL, \
*d1 = ASSERT_PTR(strdup(i.name)), \
*d2 = ASSERT_PTR(strdup(i.path)); \
int r = install_name_printf(scope, &src, pattern, NULL, &t); \
int r = install_name_printf(scope, &src, pattern, &t); \
assert_se(result ? r >= 0 : r < 0); \
memzero(i.name, strlen(i.name)); \
memzero(i.path, strlen(i.path)); \