compare: move test_order() → compare-operator.[ch]

diff --git a/src/shared/compare-operator.c b/src/shared/compare-operator.c
index f9796ab80c0a85ddca3bf9139dfa33343ccae36f..385f41894b9cde2bee2b8e1c444484171afa83a8 100644 (file)
--- a/src/shared/compare-operator.c
+++ b/src/shared/compare-operator.c
@@ -36,3 +36,30 @@ CompareOperator parse_compare_operator(const char **s, bool allow_fnmatch) {
 
         return _COMPARE_OPERATOR_INVALID;
 }
+
+int test_order(int k, CompareOperator op) {
+
+        switch (op) {
+
+        case COMPARE_LOWER:
+                return k < 0;
+
+        case COMPARE_LOWER_OR_EQUAL:
+                return k <= 0;
+
+        case COMPARE_EQUAL:
+                return k == 0;
+
+        case COMPARE_UNEQUAL:
+                return k != 0;
+
+        case COMPARE_GREATER_OR_EQUAL:
+                return k >= 0;
+
+        case COMPARE_GREATER:
+                return k > 0;
+
+        default:
+                return -EINVAL;
+        }
+}

diff --git a/src/shared/compare-operator.h b/src/shared/compare-operator.h
index 2efd4cae688c5c0aaf9e65337bf50cb299e669f5..9d1b71ed9981b47df0ff0e4259ea6b2046c3d967 100644 (file)
--- a/src/shared/compare-operator.h
+++ b/src/shared/compare-operator.h
@@ -37,3 +37,5 @@ static inline bool COMPARE_OPERATOR_IS_ORDER(CompareOperator c) {
 }
 
 CompareOperator parse_compare_operator(const char **s, bool allow_fnmatch);
+
+int test_order(int k, CompareOperator op);

diff --git a/src/shared/condition.c b/src/shared/condition.c
index dc0d6d8eb5c9fe2c70542d2588d320aba58acd39..d5aee1d7935634da6a0f5dc24fa719e68a6c73a2 100644 (file)
--- a/src/shared/condition.c
+++ b/src/shared/condition.c
@@ -183,33 +183,6 @@ static int condition_test_credential(Condition *c, char **env) {
         return false;
 }
 
-static bool test_order(int k, CompareOperator p) {
-        switch (p) {
-
-        case COMPARE_LOWER:
-                return k < 0;
-
-        case COMPARE_LOWER_OR_EQUAL:
-                return k <= 0;
-
-        case COMPARE_EQUAL:
-                return k == 0;
-
-        case COMPARE_UNEQUAL:
-                return k != 0;
-
-        case COMPARE_GREATER_OR_EQUAL:
-                return k >= 0;
-
-        case COMPARE_GREATER:
-                return k > 0;
-
-        default:
-                assert_not_reached();
-
-        }
-}
-
 static int condition_test_kernel_version(Condition *c, char **env) {
         CompareOperator operator;
         struct utsname u;