core/unit: rename set_unit_path() -> setenv_unit_path()

The previous name is quite vague on what this precisely
do.

diff --git a/src/analyze/analyze-verify-util.c b/src/analyze/analyze-verify-util.c
index 8e83c9a589b1707013a337e466bcd692686e323f..1fd3c796288e2a6a7704d91c26ab53afbe563821 100644 (file)
--- a/src/analyze/analyze-verify-util.c
+++ b/src/analyze/analyze-verify-util.c
@@ -155,7 +155,7 @@ int verify_set_unit_path(char **filenames) {
             !strextend_with_separator(&joined, ":", strempty(old)))
                 return -ENOMEM;
 
-        assert_se(set_unit_path(joined) >= 0);
+        assert_se(setenv_unit_path(joined) >= 0);
         return 0;
 }
 

diff --git a/src/core/unit.c b/src/core/unit.c
index 6bd68c7d465e6b0693a0ffd28d62656c201afba3..e0f9f9b84a613d1d6ae9a32b39ae62a2868f8a12 100644 (file)
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -3317,9 +3317,11 @@ int unit_add_two_dependencies_by_name(Unit *u, UnitDependency d, UnitDependency
         return unit_add_two_dependencies(u, d, e, other, add_reference, mask);
 }
 
-int set_unit_path(const char *p) {
+int setenv_unit_path(const char *p) {
+        assert(p);
+
         /* This is mostly for debug purposes */
-        return RET_NERRNO(setenv("SYSTEMD_UNIT_PATH", p, 1));
+        return RET_NERRNO(setenv("SYSTEMD_UNIT_PATH", p, /* overwrite = */ true));
 }
 
 char* unit_dbus_path(Unit *u) {

diff --git a/src/core/unit.h b/src/core/unit.h
index 7f11539986b32ed226c85bec8f8ff1a39d2517d3..bb360e30ed23a6bfd68ef0f426112b9ccea19bc7 100644 (file)
--- a/src/core/unit.h
+++ b/src/core/unit.h
@@ -880,7 +880,7 @@ void unit_unwatch_bus_name(Unit *u, const char *name);
 
 bool unit_job_is_applicable(Unit *u, JobType j);
 
-int set_unit_path(const char *p);
+int setenv_unit_path(const char *p);
 
 char* unit_dbus_path(Unit *u);
 char* unit_dbus_path_invocation_id(Unit *u);

diff --git a/src/test/test-bpf-firewall.c b/src/test/test-bpf-firewall.c
index cc677740d8f984017a5da1eb653f9f3734f12094..10bfa52e26bb97b1cd2d4bd2dfd8bf8d0cec5205 100644 (file)
--- a/src/test/test-bpf-firewall.c
+++ b/src/test/test-bpf-firewall.c
@@ -56,7 +56,7 @@ int main(int argc, char *argv[]) {
 
         _cleanup_free_ char *unit_dir = NULL;
         ASSERT_OK(get_testdata_dir("units", &unit_dir));
-        ASSERT_OK(set_unit_path(unit_dir));
+        ASSERT_OK(setenv_unit_path(unit_dir));
         assert_se(runtime_dir = setup_fake_runtime_dir());
 
         r = bpf_program_new(BPF_PROG_TYPE_CGROUP_SKB, "sd_trivial", &p);

diff --git a/src/test/test-bpf-foreign-programs.c b/src/test/test-bpf-foreign-programs.c
index 34ccb74ccbe04087b3f90d457d0891e51e24a429..658746afa06313d6a15342d209944f1209ef8dcc 100644 (file)
--- a/src/test/test-bpf-foreign-programs.c
+++ b/src/test/test-bpf-foreign-programs.c
@@ -298,7 +298,7 @@ int main(int argc, char *argv[]) {
                 return log_tests_skipped("cgroupfs not available");
 
         ASSERT_OK(get_testdata_dir("units", &unit_dir));
-        ASSERT_OK(set_unit_path(unit_dir));
+        ASSERT_OK(setenv_unit_path(unit_dir));
         assert_se(runtime_dir = setup_fake_runtime_dir());
 
         ASSERT_OK(manager_new(RUNTIME_SCOPE_USER, MANAGER_TEST_RUN_BASIC, &m));

diff --git a/src/test/test-bpf-restrict-fs.c b/src/test/test-bpf-restrict-fs.c
index 7ece33750b5aa93cc15d1b7c42bc82ccf3553eba..11e97bf922db570ed1db0f15d3f8ef798a52d292 100644 (file)
--- a/src/test/test-bpf-restrict-fs.c
+++ b/src/test/test-bpf-restrict-fs.c
@@ -83,7 +83,7 @@ int main(int argc, char *argv[]) {
                 return log_tests_skipped("cgroupfs not available");
 
         ASSERT_OK(get_testdata_dir("units", &unit_dir));
-        ASSERT_OK(set_unit_path(unit_dir));
+        ASSERT_OK(setenv_unit_path(unit_dir));
         assert_se(runtime_dir = setup_fake_runtime_dir());
 
         ASSERT_OK(manager_new(RUNTIME_SCOPE_SYSTEM, MANAGER_TEST_RUN_BASIC, &m));

diff --git a/src/test/test-cgroup-mask.c b/src/test/test-cgroup-mask.c
index 857102f8a0a111277d44d82a5dbbca86623f6592..1050c4f47dad771689b796403c12f6d97cf5b2bc 100644 (file)
--- a/src/test/test-cgroup-mask.c
+++ b/src/test/test-cgroup-mask.c
@@ -40,7 +40,7 @@ TEST_RET(cgroup_mask, .sd_booted = true) {
         /* Prepare the manager. */
         _cleanup_free_ char *unit_dir = NULL;
         ASSERT_OK(get_testdata_dir("units", &unit_dir));
-        ASSERT_OK(set_unit_path(unit_dir));
+        ASSERT_OK(setenv_unit_path(unit_dir));
         assert_se(runtime_dir = setup_fake_runtime_dir());
         r = manager_new(RUNTIME_SCOPE_USER, MANAGER_TEST_RUN_BASIC, &m);
         if (IN_SET(r, -EPERM, -EACCES)) {

diff --git a/src/test/test-cgroup-unit-default.c b/src/test/test-cgroup-unit-default.c
index 97101d40a5e9ac1bca8dfe452226002eba7662d4..818d75eeac21e0d5b7d487cf2b1991a39fc25b88 100644 (file)
--- a/src/test/test-cgroup-unit-default.c
+++ b/src/test/test-cgroup-unit-default.c
@@ -24,7 +24,7 @@ TEST_RET(default_memory_low, .sd_booted = true) {
 
         _cleanup_free_ char *unit_dir = NULL;
         ASSERT_OK(get_testdata_dir("units", &unit_dir));
-        ASSERT_OK(set_unit_path(unit_dir));
+        ASSERT_OK(setenv_unit_path(unit_dir));
         assert_se(runtime_dir = setup_fake_runtime_dir());
         r = manager_new(RUNTIME_SCOPE_USER, MANAGER_TEST_RUN_BASIC, &m);
         if (IN_SET(r, -EPERM, -EACCES)) {

diff --git a/src/test/test-engine.c b/src/test/test-engine.c
index fa64fbefaba8500a8586cca20834de6e49444cb8..0169f8320fd9bf9846de56b339e5ba1cd0658650 100644 (file)
--- a/src/test/test-engine.c
+++ b/src/test/test-engine.c
@@ -89,8 +89,8 @@ int main(int argc, char *argv[]) {
 
         /* prepare the test */
         _cleanup_free_ char *unit_dir = NULL;
-        assert_se(get_testdata_dir("units", &unit_dir) >= 0);
-        assert_se(set_unit_path(unit_dir) >= 0);
+        ASSERT_OK(get_testdata_dir("units", &unit_dir));
+        ASSERT_OK(setenv_unit_path(unit_dir));
         assert_se(runtime_dir = setup_fake_runtime_dir());
 
         r = manager_new(RUNTIME_SCOPE_USER, MANAGER_TEST_RUN_BASIC, &m);

diff --git a/src/test/test-execute.c b/src/test/test-execute.c
index 56f5e340bef54cb8004a0d35f6c6d20c93d6fa10..b068c3aee071a33077fb6545f0115bbd17e387f4 100644 (file)
--- a/src/test/test-execute.c
+++ b/src/test/test-execute.c
@@ -1397,7 +1397,7 @@ static void run_tests(RuntimeScope scope, char **patterns) {
         ASSERT_NOT_NULL(runtime_dir = setup_fake_runtime_dir());
         ASSERT_NOT_NULL(user_runtime_unit_dir = path_join(runtime_dir, "systemd/user"));
         ASSERT_NOT_NULL(unit_paths = strjoin(PRIVATE_UNIT_DIR, ":", user_runtime_unit_dir));
-        ASSERT_OK(set_unit_path(unit_paths));
+        ASSERT_OK(setenv_unit_path(unit_paths));
 
         r = manager_new(scope, MANAGER_TEST_RUN_BASIC, &m);
         if (manager_errno_skip_test(r))

diff --git a/src/test/test-path.c b/src/test/test-path.c
index e49653a2404b3173cd085dc00ecae0fc82c70db6..fd3120f922d0081c3210b502a51bfed08a6c7dfe 100644 (file)
--- a/src/test/test-path.c
+++ b/src/test/test-path.c
@@ -397,8 +397,8 @@ int main(int argc, char *argv[]) {
 
         test_setup_logging(LOG_INFO);
 
-        assert_se(get_testdata_dir("test-path", &test_path) >= 0);
-        assert_se(set_unit_path(test_path) >= 0);
+        ASSERT_OK(get_testdata_dir("test-path", &test_path));
+        ASSERT_OK(setenv_unit_path(test_path));
         assert_se(runtime_dir = setup_fake_runtime_dir());
 
         for (const test_function_t *test = tests; *test; test++) {

diff --git a/src/test/test-sched-prio.c b/src/test/test-sched-prio.c
index 3c3b8dcf4a00e9bcd3a7197b22cf2612892b497b..ff90842a0a68452cb140fc433604ffc835d436f5 100644 (file)
--- a/src/test/test-sched-prio.c
+++ b/src/test/test-sched-prio.c
@@ -26,8 +26,8 @@ int main(int argc, char *argv[]) {
 
         /* prepare the test */
         _cleanup_free_ char *unit_dir = NULL;
-        assert_se(get_testdata_dir("units", &unit_dir) >= 0);
-        assert_se(set_unit_path(unit_dir) >= 0);
+        ASSERT_OK(get_testdata_dir("units", &unit_dir));
+        ASSERT_OK(setenv_unit_path(unit_dir));
         assert_se(runtime_dir = setup_fake_runtime_dir());
 
         r = manager_new(RUNTIME_SCOPE_USER, MANAGER_TEST_RUN_BASIC, &m);

diff --git a/src/test/test-socket-bind.c b/src/test/test-socket-bind.c
index 13ffa92cf13429f9ba93860ed82765979f94c422..63552013b29a7f1cf5d4bfd50682aa3559189ecd 100644 (file)
--- a/src/test/test-socket-bind.c
+++ b/src/test/test-socket-bind.c
@@ -126,8 +126,8 @@ int main(int argc, char *argv[]) {
         if (r == -ENOMEDIUM)
                 return log_tests_skipped("cgroupfs not available");
 
-        assert_se(get_testdata_dir("units", &unit_dir) >= 0);
-        assert_se(set_unit_path(unit_dir) >= 0);
+        ASSERT_OK(get_testdata_dir("units", &unit_dir));
+        ASSERT_OK(setenv_unit_path(unit_dir));
         assert_se(runtime_dir = setup_fake_runtime_dir());
 
         assert_se(manager_new(RUNTIME_SCOPE_USER, MANAGER_TEST_RUN_BASIC, &m) >= 0);

diff --git a/src/test/test-watch-pid.c b/src/test/test-watch-pid.c
index 423a9be380259bc5683d966a27a0ea61eb13c8cc..22cb404cf858ea9640306cafc13a732fe6734801 100644 (file)
--- a/src/test/test-watch-pid.c
+++ b/src/test/test-watch-pid.c
@@ -22,8 +22,8 @@ int main(int argc, char *argv[]) {
                 return log_tests_skipped("cgroupfs not available");
 
         _cleanup_free_ char *unit_dir = NULL;
-        assert_se(get_testdata_dir("units/", &unit_dir) >= 0);
-        assert_se(set_unit_path(unit_dir) >= 0);
+        ASSERT_OK(get_testdata_dir("units/", &unit_dir));
+        ASSERT_OK(setenv_unit_path(unit_dir));
 
         assert_se(runtime_dir = setup_fake_runtime_dir());