From 894d307d0d149adb46e630550566e5a3f6ff8d2e Mon Sep 17 00:00:00 2001

From: Lennart Poettering <lennart@poettering.net>

Date: Mon, 18 Mar 2019 12:21:27 +0100

Subject: [PATCH] core: rename unit_{start_limit|condition|assert}_test() to

 unit_test_xyz()

Just some renaming, no change in behaviour.

Background: I'd like to add more functions unit_test_xyz() that test

various things, hence let's streamline the naming a bit.

(cherry picked from commit 97a3f4ee052e1b8a0ff03accfa478e352891a84f)

Related: #2036608

---

 src/core/automount.c |  2 +-

 src/core/mount.c     |  2 +-

 src/core/path.c      |  2 +-

 src/core/service.c   |  2 +-

 src/core/socket.c    |  2 +-

 src/core/swap.c      |  2 +-

 src/core/timer.c     |  2 +-

 src/core/unit.c      | 11 +++++------

 src/core/unit.h      |  2 +-

 9 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/core/automount.c b/src/core/automount.c

index 76e70f4dac..2bc160cb07 100644

--- a/src/core/automount.c

+++ b/src/core/automount.c

@@ -808,7 +808,7 @@ static int automount_start(Unit *u) {

                 return -ENOENT;

         }

-        r = unit_start_limit_test(u);

+        r = unit_test_start_limit(u);

         if (r < 0) {

                 automount_enter_dead(a, AUTOMOUNT_FAILURE_START_LIMIT_HIT);

                 return r;

diff --git a/src/core/mount.c b/src/core/mount.c

index 7e80a0c974..aa586d88cb 100644

--- a/src/core/mount.c

+++ b/src/core/mount.c

@@ -1065,7 +1065,7 @@ static int mount_start(Unit *u) {

         assert(IN_SET(m->state, MOUNT_DEAD, MOUNT_FAILED));

-        r = unit_start_limit_test(u);

+        r = unit_test_start_limit(u);

         if (r < 0) {

                 mount_enter_dead(m, MOUNT_FAILURE_START_LIMIT_HIT);

                 return r;

diff --git a/src/core/path.c b/src/core/path.c

index ed40bc6c19..4bccc0396b 100644

--- a/src/core/path.c

+++ b/src/core/path.c

@@ -565,7 +565,7 @@ static int path_start(Unit *u) {

                 return -ENOENT;

         }

-        r = unit_start_limit_test(u);

+        r = unit_test_start_limit(u);

         if (r < 0) {

                 path_enter_dead(p, PATH_FAILURE_START_LIMIT_HIT);

                 return r;

diff --git a/src/core/service.c b/src/core/service.c

index 7969bbf071..1a1de43d0d 100644

--- a/src/core/service.c

+++ b/src/core/service.c

@@ -2388,7 +2388,7 @@ static int service_start(Unit *u) {

         assert(IN_SET(s->state, SERVICE_DEAD, SERVICE_FAILED));

         /* Make sure we don't enter a busy loop of some kind. */

-        r = unit_start_limit_test(u);

+        r = unit_test_start_limit(u);

         if (r < 0) {

                 service_enter_dead(s, SERVICE_FAILURE_START_LIMIT_HIT, false);

                 return r;

diff --git a/src/core/socket.c b/src/core/socket.c

index 50c32ed8f4..09491c6677 100644

--- a/src/core/socket.c

+++ b/src/core/socket.c

@@ -2469,7 +2469,7 @@ static int socket_start(Unit *u) {

         assert(IN_SET(s->state, SOCKET_DEAD, SOCKET_FAILED));

-        r = unit_start_limit_test(u);

+        r = unit_test_start_limit(u);

         if (r < 0) {

                 socket_enter_dead(s, SOCKET_FAILURE_START_LIMIT_HIT);

                 return r;

diff --git a/src/core/swap.c b/src/core/swap.c

index a8f127f660..823699699e 100644

--- a/src/core/swap.c

+++ b/src/core/swap.c

@@ -851,7 +851,7 @@ static int swap_start(Unit *u) {

                 if (UNIT(other)->job && UNIT(other)->job->state == JOB_RUNNING)

                         return -EAGAIN;

-        r = unit_start_limit_test(u);

+        r = unit_test_start_limit(u);

         if (r < 0) {

                 swap_enter_dead(s, SWAP_FAILURE_START_LIMIT_HIT);

                 return r;

diff --git a/src/core/timer.c b/src/core/timer.c

index 1718ffc5a5..be16321296 100644

--- a/src/core/timer.c

+++ b/src/core/timer.c

@@ -599,7 +599,7 @@ static int timer_start(Unit *u) {

                 return -ENOENT;

         }

-        r = unit_start_limit_test(u);

+        r = unit_test_start_limit(u);

         if (r < 0) {

                 timer_enter_dead(t, TIMER_FAILURE_START_LIMIT_HIT);

                 return r;

diff --git a/src/core/unit.c b/src/core/unit.c

index 23afa24c77..9013186d8a 100644

--- a/src/core/unit.c

+++ b/src/core/unit.c

@@ -1633,7 +1633,7 @@ static bool unit_condition_test_list(Unit *u, Condition *first, const char *(*to

         return triggered != 0;

 }

-static bool unit_condition_test(Unit *u) {

+static bool unit_test_condition(Unit *u) {

         assert(u);

         dual_timestamp_get(&u->condition_timestamp);

@@ -1642,7 +1642,7 @@ static bool unit_condition_test(Unit *u) {

         return u->condition_result;

 }

-static bool unit_assert_test(Unit *u) {

+static bool unit_test_assert(Unit *u) {

         assert(u);

         dual_timestamp_get(&u->assert_timestamp);

@@ -1657,8 +1657,7 @@ void unit_status_printf(Unit *u, const char *status, const char *unit_status_msg

         REENABLE_WARNING;

 }

-

-int unit_start_limit_test(Unit *u) {

+int unit_test_start_limit(Unit *u) {

         assert(u);

         if (ratelimit_below(&u->start_limit)) {

@@ -1750,14 +1749,14 @@ int unit_start(Unit *u) {

          * speed up activation in case there is some hold-off time,

          * but we don't want to recheck the condition in that case. */

         if (state != UNIT_ACTIVATING &&

-            !unit_condition_test(u)) {

+            !unit_test_condition(u)) {

                 log_unit_debug(u, "Starting requested but condition failed. Not starting unit.");

                 return -EALREADY;

         }

         /* If the asserts failed, fail the entire job */

         if (state != UNIT_ACTIVATING &&

-            !unit_assert_test(u)) {

+            !unit_test_assert(u)) {

                 log_unit_notice(u, "Starting requested but asserts failed.");

                 return -EPROTO;

         }

diff --git a/src/core/unit.h b/src/core/unit.h

index ec45b5fb48..a8bc350b66 100644

--- a/src/core/unit.h

+++ b/src/core/unit.h

@@ -786,7 +786,7 @@ static inline bool unit_supported(Unit *u) {

 void unit_warn_if_dir_nonempty(Unit *u, const char* where);

 int unit_fail_if_noncanonical(Unit *u, const char* where);

-int unit_start_limit_test(Unit *u);

+int unit_test_start_limit(Unit *u);

 void unit_unref_uid(Unit *u, bool destroy_now);

 int unit_ref_uid(Unit *u, uid_t uid, bool clean_ipc);