Then, rename verify_generate_path() -> verify_set_unit_path().
int r, q = 1;
if (unit) {
- _cleanup_strv_free_ char **filenames = NULL;
- _cleanup_free_ char *var = NULL;
-
- filenames = strv_new(unit);
- if (!filenames)
- return log_oom();
-
- r = verify_generate_path(&var, filenames);
+ r = verify_set_unit_path(STRV_MAKE(unit));
if (r < 0)
- return log_error_errno(r, "Failed to generate unit load path: %m");
-
- assert_se(set_unit_path(var) >= 0);
+ return log_error_errno(r, "Failed to set unit load path: %m");
}
r = manager_new(scope, MANAGER_TEST_RUN_MINIMAL|MANAGER_TEST_DONT_OPEN_EXECUTOR, &m);
_cleanup_(manager_freep) Manager *m = NULL;
Unit *units[strv_length(filenames)];
- _cleanup_free_ char *var = NULL;
int r, k;
size_t count = 0;
if (strv_isempty(filenames))
return 0;
- /* set the path */
- r = verify_generate_path(&var, filenames);
+ r = verify_set_unit_path(filenames);
if (r < 0)
- return log_error_errno(r, "Failed to generate unit load path: %m");
-
- assert_se(set_unit_path(var) >= 0);
+ return log_error_errno(r, "Failed to set unit load path: %m");
r = manager_new(scope, flags, &m);
if (r < 0)
return 0;
}
-int verify_generate_path(char **ret, char **filenames) {
+int verify_set_unit_path(char **filenames) {
_cleanup_strv_free_ char **ans = NULL;
_cleanup_free_ char *joined = NULL;
const char *old;
!strextend_with_separator(&joined, ":", old ?: ""))
return -ENOMEM;
- *ret = TAKE_PTR(joined);
+ assert_se(set_unit_path(joined) >= 0);
return 0;
}
_cleanup_(set_destroy_ignore_pointer_max) Set *s = NULL;
_unused_ _cleanup_(clear_log_syntax_callback) dummy_t dummy;
Unit *units[strv_length(filenames)];
- _cleanup_free_ char *var = NULL;
int r, k, count = 0;
if (strv_isempty(filenames))
set_log_syntax_callback(log_syntax_callback, &s);
/* set the path */
- r = verify_generate_path(&var, filenames);
+ r = verify_set_unit_path(filenames);
if (r < 0)
- return log_error_errno(r, "Failed to generate unit load path: %m");
-
- assert_se(set_unit_path(var) >= 0);
+ return log_error_errno(r, "Failed to set unit load path: %m");
r = manager_new(scope, flags, &m);
if (r < 0)
_RECURSIVE_ERRORS_INVALID = -EINVAL,
} RecursiveErrors;
-int verify_generate_path(char **var, char **filenames);
+int verify_set_unit_path(char **filenames);
int verify_prepare_filename(const char *filename, char **ret);
int verify_executable(Unit *u, const ExecCommand *exec, const char *root);
int verify_units(char **filenames, RuntimeScope scope, bool check_man, bool run_generators, RecursiveErrors recursive_errors, const char *root);