diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2022-03-17 10:16:30 +0100 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2022-03-29 16:17:56 +0200 |
| commit | 38e8a6c7fdffd3389cb3596139b1309579193946 (patch) | |
| tree | 3a91e30459bf29a2a69064134d1d528178aaa791 /src/shared/install.c | |
| parent | 466f6979c90aaee62c33723392cc49c6638a3f46 (diff) | |
| download | systemd-38e8a6c7fdffd3389cb3596139b1309579193946.tar.gz | |
shared/install: stop passing duplicate root argument to install_name_printf()
All callers were just passing info + info->root, we can simplify this.
Diffstat (limited to 'src/shared/install.c')
| -rw-r--r-- | src/shared/install.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/shared/install.c b/src/shared/install.c index 91e38c57cc..d5e1979280 100644 --- a/src/shared/install.c +++ b/src/shared/install.c @@ -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; |