chiark / gitweb /
shared: rename condition-util.[ch] to condition.[ch]
authorLennart Poettering <lennart@poettering.net>
Thu, 6 Nov 2014 13:19:05 +0000 (14:19 +0100)
committerLennart Poettering <lennart@poettering.net>
Thu, 6 Nov 2014 13:21:11 +0000 (14:21 +0100)
Now that we only have one file with condition implementations around, we
can drop the -util suffix and simplify things a bit.

12 files changed:
.gitignore
Makefile.am
src/core/unit.h
src/libsystemd-network/network-internal.c
src/libsystemd-network/network-internal.h
src/network/networkd-netdev.h
src/network/networkd.h
src/shared/condition.c [moved from src/shared/condition-util.c with 99% similarity]
src/shared/condition.h [moved from src/shared/condition-util.h with 100% similarity]
src/test/test-condition.c [moved from src/test/test-condition-util.c with 99% similarity]
src/test/test-tables.c
src/udev/net/link-config.h

index 6649d19..4c66564 100644 (file)
 /test-cgroup-util
 /test-compress
 /test-compress-benchmark
-/test-condition-util
+/test-condition
 /test-conf-files
 /test-copy
 /test-coredump-vacuum
index a10c306..461ffa9 100644 (file)
@@ -861,8 +861,8 @@ libsystemd_shared_la_SOURCES = \
        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 \
@@ -1357,7 +1357,7 @@ tests += \
        test-capability \
        test-async \
        test-ratelimit \
-       test-condition-util \
+       test-condition \
        test-uid-range \
        test-bus-policy \
        test-locale-util \
@@ -1517,10 +1517,10 @@ test_copy_SOURCES = \
 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 \
index b5a224b..8b24272 100644 (file)
@@ -38,7 +38,7 @@ typedef struct UnitStatusMessageFormats UnitStatusMessageFormats;
 #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"
index f3141f7..6f16050 100644 (file)
@@ -32,7 +32,7 @@
 #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) {
index 49387d0..c64db2e 100644 (file)
@@ -26,7 +26,7 @@
 #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,
index e9a8a16..a6fad2d 100644 (file)
@@ -25,7 +25,6 @@
 #include "hashmap.h"
 #include "list.h"
 #include "set.h"
-#include "condition-util.h"
 #include "in-addr-util.h"
 
 typedef struct NetDevVTable NetDevVTable;
index d4e79ab..19a661e 100644 (file)
@@ -37,7 +37,7 @@
 #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
similarity index 99%
rename from src/shared/condition-util.c
rename to src/shared/condition.c
index 5db20a7..08bebee 100644 (file)
@@ -28,7 +28,6 @@
 
 #include "sd-id128.h"
 #include "util.h"
-#include "condition-util.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 "condition.h"
 
 Condition* condition_new(ConditionType type, const char *parameter, bool trigger, bool negate) {
         Condition *c;
similarity index 99%
rename from src/test/test-condition-util.c
rename to src/test/test-condition.c
index b69e62b..349c647 100644 (file)
@@ -17,7 +17,7 @@
   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"
index d0a621c..97d5609 100644 (file)
@@ -20,7 +20,7 @@
 #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"
index 5f3d4ad..844ea98 100644 (file)
 #pragma once
 
 #include "ethtool-util.h"
-
-#include "condition-util.h"
-#include "libudev.h"
+#include "condition.h"
 #include "util.h"
 #include "list.h"
+#include "libudev.h"
 
 typedef struct link_config_ctx link_config_ctx;
 typedef struct link_config link_config;