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

Move and rename parse_path_argument() function

Browse Source 
This fits better in shared/, and the new parse-argument.c file is a good home
for it.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2021-02-15 08:50:45 +01:00
parent 923e2122d0
commit 614b022c76
18 changed files with 71 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/nspawn/nspawn.c
+7 -6
View File
@@ -78,6 +78,7 @@
#include "nulstr-util.h"
#include "os-util.h"
#include "pager.h"
#include "parse-argument.h"
#include "parse-util.h"
#include "path-util.h"
#include "pretty-print.h"
@@ -791,7 +792,7 @@ static int parse_argv(int argc, char *argv[]) {
return version();
case 'D':
r = parse_path_argument_and_warn(optarg, false, &arg_directory);
r = parse_path_argument(optarg, false, &arg_directory);
if (r < 0)
return r;
@@ -799,7 +800,7 @@ static int parse_argv(int argc, char *argv[]) {
break;
case ARG_TEMPLATE:
r = parse_path_argument_and_warn(optarg, false, &arg_template);
r = parse_path_argument(optarg, false, &arg_template);
if (r < 0)
return r;
@@ -807,7 +808,7 @@ static int parse_argv(int argc, char *argv[]) {
break;
case 'i':
r = parse_path_argument_and_warn(optarg, false, &arg_image);
r = parse_path_argument(optarg, false, &arg_image);
if (r < 0)
return r;
@@ -815,7 +816,7 @@ static int parse_argv(int argc, char *argv[]) {
break;
case ARG_OCI_BUNDLE:
r = parse_path_argument_and_warn(optarg, false, &arg_oci_bundle);
r = parse_path_argument(optarg, false, &arg_oci_bundle);
if (r < 0)
return r;
@@ -934,7 +935,7 @@ static int parse_argv(int argc, char *argv[]) {
break;
case ARG_NETWORK_NAMESPACE_PATH:
r = parse_path_argument_and_warn(optarg, false, &arg_network_namespace_path);
r = parse_path_argument(optarg, false, &arg_network_namespace_path);
if (r < 0)
return r;
@@ -1386,7 +1387,7 @@ static int parse_argv(int argc, char *argv[]) {
}
case ARG_VERITY_DATA:
r = parse_path_argument_and_warn(optarg, false, &arg_verity_settings.data_path);
r = parse_path_argument(optarg, false, &arg_verity_settings.data_path);
if (r < 0)
return r;
break;