shared: rename condition-util.[ch] to condition.[ch]

Now that we only have one file with condition implementations around, we
can drop the -util suffix and simplify things a bit.

diff --git a/.gitignore b/.gitignore
index 6649d19fc7a877b8098e9cdddecdcbe78cf9812e..4c66564c4d306cbdb12cb4e69b79967d73a25dc2 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -157,7 +157,7 @@
 /test-cgroup-util
 /test-compress
 /test-compress-benchmark
 /test-cgroup-util
 /test-compress
 /test-compress-benchmark

-/test-condition-util
+/test-condition

 /test-conf-files
 /test-copy
 /test-coredump-vacuum
 /test-conf-files
 /test-copy
 /test-coredump-vacuum

diff --git a/Makefile.am b/Makefile.am
index a10c306cebc776c652c722bd94cde2dcf161136b..461ffa944d00b44c72267a85fd87130649634b24 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -861,8 +861,8 @@ libsystemd_shared_la_SOURCES = \
        src/shared/audit.h \
        src/shared/xml.c \
        src/shared/xml.h \
        src/shared/audit.h \
        src/shared/xml.c \
        src/shared/xml.h \

-       src/shared/condition-util.c \
-       src/shared/condition-util.h \
+       src/shared/condition.c \
+       src/shared/condition.h \

        src/shared/bus-label.c \
        src/shared/bus-label.h \
        src/shared/gpt.h \
        src/shared/bus-label.c \
        src/shared/bus-label.h \
        src/shared/gpt.h \


@@ -1357,7 +1357,7 @@ tests += \
        test-capability \
        test-async \
        test-ratelimit \
        test-capability \
        test-async \
        test-ratelimit \

-       test-condition-util \
+       test-condition \

        test-uid-range \
        test-bus-policy \
        test-locale-util \
        test-uid-range \
        test-bus-policy \
        test-locale-util \


@@ -1517,10 +1517,10 @@ test_copy_SOURCES = \
 test_copy_LDADD = \
        libsystemd-shared.la
 
 test_copy_LDADD = \
        libsystemd-shared.la
 

-test_condition_util_SOURCES = \
-       src/test/test-condition-util.c
+test_condition_SOURCES = \
+       src/test/test-condition.c

 
 

-test_condition_util_LDADD = \
+test_condition_LDADD = \

        libsystemd-shared.la \
        libsystemd-internal.la \
        libsystemd-capability.la \
        libsystemd-shared.la \
        libsystemd-internal.la \
        libsystemd-capability.la \

diff --git a/src/core/unit.h b/src/core/unit.h
index b5a224b3d4d737740c8242e0d4ee67462c205329..8b242722454a14bf63bc5c00f56358af100c6a85 100644 (file)
--- a/src/core/unit.h
+++ b/src/core/unit.h
@@ -38,7 +38,7 @@ typedef struct UnitStatusMessageFormats UnitStatusMessageFormats;
 #include "socket-util.h"
 #include "execute.h"
 #include "cgroup.h"
 #include "socket-util.h"
 #include "execute.h"
 #include "cgroup.h"

-#include "condition-util.h"
+#include "condition.h"

 #include "install.h"
 #include "unit-name.h"
 #include "failure-action.h"
 #include "install.h"
 #include "unit-name.h"
 #include "failure-action.h"

diff --git a/src/libsystemd-network/network-internal.c b/src/libsystemd-network/network-internal.c
index f3141f75dca3da84f59ee5ec82854b2fbef6599d..6f16050cdc1097d34ee1a447f8cca9cffeb4f5f4 100644 (file)
--- a/src/libsystemd-network/network-internal.c
+++ b/src/libsystemd-network/network-internal.c
@@ -32,7 +32,7 @@
 #include "utf8.h"
 #include "util.h"
 #include "conf-parser.h"
 #include "utf8.h"
 #include "util.h"
 #include "conf-parser.h"

-#include "condition-util.h"
+#include "condition.h"

 #include "network-internal.h"
 
 const char *net_get_name(struct udev_device *device) {
 #include "network-internal.h"
 
 const char *net_get_name(struct udev_device *device) {

diff --git a/src/libsystemd-network/network-internal.h b/src/libsystemd-network/network-internal.h
index 49387d03cf379bee8ca138940b6fde69df59cfa5..c64db2e79d27a3bcb316481691ece5925caf490d 100644 (file)
--- a/src/libsystemd-network/network-internal.h
+++ b/src/libsystemd-network/network-internal.h
@@ -26,7 +26,7 @@
 #include <stdbool.h>
 
 #include "udev.h"
 #include <stdbool.h>
 
 #include "udev.h"

-#include "condition-util.h"
+#include "condition.h"

 
 bool net_match_config(const struct ether_addr *match_mac,
                       const char *match_path,
 
 bool net_match_config(const struct ether_addr *match_mac,
                       const char *match_path,

diff --git a/src/network/networkd-netdev.h b/src/network/networkd-netdev.h
index e9a8a169db58ade08c8f2bbb4f786f22c71b2fbd..a6fad2dbc465946ddce061ecd7b61a5741964eb7 100644 (file)
--- a/src/network/networkd-netdev.h
+++ b/src/network/networkd-netdev.h
@@ -25,7 +25,6 @@
 #include "hashmap.h"
 #include "list.h"
 #include "set.h"
 #include "hashmap.h"
 #include "list.h"
 #include "set.h"

-#include "condition-util.h"

 #include "in-addr-util.h"
 
 typedef struct NetDevVTable NetDevVTable;
 #include "in-addr-util.h"
 
 typedef struct NetDevVTable NetDevVTable;

diff --git a/src/network/networkd.h b/src/network/networkd.h
index d4e79ab2f339badf6afb61761f90c70e39a60543..19a661e1312cebcbf03ab830cd0b704989908542 100644 (file)
--- a/src/network/networkd.h
+++ b/src/network/networkd.h
@@ -37,7 +37,7 @@
 #include "hashmap.h"
 #include "list.h"
 #include "set.h"
 #include "hashmap.h"
 #include "list.h"
 #include "set.h"

-#include "condition-util.h"
+#include "condition.h"

 #include "in-addr-util.h"
 
 #define CACHE_INFO_INFINITY_LIFE_TIME 0xFFFFFFFFU
 #include "in-addr-util.h"
 
 #define CACHE_INFO_INFINITY_LIFE_TIME 0xFFFFFFFFU

diff --git a/src/shared/condition-util.c b/src/shared/condition.c
similarity index 99%
rename from src/shared/condition-util.c
rename to src/shared/condition.c
index 5db20a7085d393c3b4cad65dfd15f6a7729cce7c..08bebeee73c22619edd9833dd89b41467cff0972 100644 (file)
--- a/src/shared/condition-util.c
+++ b/src/shared/condition.c
@@ -28,7 +28,6 @@
 
 #include "sd-id128.h"
 #include "util.h"
 
 #include "sd-id128.h"
 #include "util.h"

-#include "condition-util.h"

 #include "virt.h"
 #include "path-util.h"
 #include "fileio.h"
 #include "virt.h"
 #include "path-util.h"
 #include "fileio.h"


@@ -40,6 +39,7 @@
 #include "ima-util.h"
 #include "selinux-util.h"
 #include "audit.h"
 #include "ima-util.h"
 #include "selinux-util.h"
 #include "audit.h"

+#include "condition.h"

 
 Condition* condition_new(ConditionType type, const char *parameter, bool trigger, bool negate) {
         Condition *c;
 
 Condition* condition_new(ConditionType type, const char *parameter, bool trigger, bool negate) {
         Condition *c;

diff --git a/src/shared/condition-util.h b/src/shared/condition.h
similarity index 100%
rename from src/shared/condition-util.h
rename to src/shared/condition.h

diff --git a/src/test/test-condition-util.c b/src/test/test-condition.c
similarity index 99%
rename from src/test/test-condition-util.c
rename to src/test/test-condition.c
index b69e62bfd3c7be33087233d615cdb45fdae307ed..349c6470c309d42b60739f75d0aca3ec14624079 100644 (file)
--- a/src/test/test-condition-util.c
+++ b/src/test/test-condition.c
@@ -17,7 +17,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include "condition-util.h"
+#include "condition.h"

 #include "macro.h"
 #include "util.h"
 #include "log.h"
 #include "macro.h"
 #include "util.h"
 #include "log.h"

diff --git a/src/test/test-tables.c b/src/test/test-tables.c
index d0a621c7755e8958c2d7aae6bec9802d8ff37989..97d5609adffeb58a6a44aab22a2489a3963b89f2 100644 (file)
--- a/src/test/test-tables.c
+++ b/src/test/test-tables.c
@@ -20,7 +20,7 @@
 #include "automount.h"
 #include "cgroup.h"
 #include "compress.h"
 #include "automount.h"
 #include "cgroup.h"
 #include "compress.h"

-#include "condition-util.h"
+#include "condition.h"

 #include "device.h"
 #include "execute.h"
 #include "exit-status.h"
 #include "device.h"
 #include "execute.h"
 #include "exit-status.h"

diff --git a/src/udev/net/link-config.h b/src/udev/net/link-config.h
index 5f3d4ad142e2dc24d964e3828680bad27374b1c6..844ea9862943887b4015646d252b0bbe3a9f9ae1 100644 (file)
--- a/src/udev/net/link-config.h
+++ b/src/udev/net/link-config.h
@@ -22,11 +22,10 @@
 #pragma once
 
 #include "ethtool-util.h"
 #pragma once
 
 #include "ethtool-util.h"

-
-#include "condition-util.h"
-#include "libudev.h"
+#include "condition.h"

 #include "util.h"
 #include "list.h"
 #include "util.h"
 #include "list.h"

+#include "libudev.h"

 
 typedef struct link_config_ctx link_config_ctx;
 typedef struct link_config link_config;
 
 typedef struct link_config_ctx link_config_ctx;
 typedef struct link_config link_config;