From 134e56dcc53970a20a858283650bb92cd5da1d17 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 6 Nov 2014 14:19:05 +0100 Subject: [PATCH] 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. --- .gitignore | 2 +- Makefile.am | 12 ++++++------ src/core/unit.h | 2 +- src/libsystemd-network/network-internal.c | 2 +- src/libsystemd-network/network-internal.h | 2 +- src/network/networkd-netdev.h | 1 - src/network/networkd.h | 2 +- src/shared/{condition-util.c => condition.c} | 2 +- src/shared/{condition-util.h => condition.h} | 0 src/test/{test-condition-util.c => test-condition.c} | 2 +- src/test/test-tables.c | 2 +- src/udev/net/link-config.h | 5 ++--- 12 files changed, 16 insertions(+), 18 deletions(-) rename src/shared/{condition-util.c => condition.c} (99%) rename src/shared/{condition-util.h => condition.h} (100%) rename src/test/{test-condition-util.c => test-condition.c} (99%) diff --git a/.gitignore b/.gitignore index 6649d19fc..4c66564c4 100644 --- a/.gitignore +++ b/.gitignore @@ -157,7 +157,7 @@ /test-cgroup-util /test-compress /test-compress-benchmark -/test-condition-util +/test-condition /test-conf-files /test-copy /test-coredump-vacuum diff --git a/Makefile.am b/Makefile.am index a10c306ce..461ffa944 100644 --- 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/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 \ diff --git a/src/core/unit.h b/src/core/unit.h index b5a224b3d..8b2427224 100644 --- 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 "condition-util.h" +#include "condition.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 f3141f75d..6f16050cd 100644 --- 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 "condition-util.h" +#include "condition.h" #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 49387d03c..c64db2e79 100644 --- a/src/libsystemd-network/network-internal.h +++ b/src/libsystemd-network/network-internal.h @@ -26,7 +26,7 @@ #include #include "udev.h" -#include "condition-util.h" +#include "condition.h" 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 e9a8a169d..a6fad2dbc 100644 --- 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 "condition-util.h" #include "in-addr-util.h" typedef struct NetDevVTable NetDevVTable; diff --git a/src/network/networkd.h b/src/network/networkd.h index d4e79ab2f..19a661e13 100644 --- a/src/network/networkd.h +++ b/src/network/networkd.h @@ -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 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 5db20a708..08bebeee7 100644 --- a/src/shared/condition-util.c +++ b/src/shared/condition.c @@ -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; 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 b69e62bfd..349c6470c 100644 --- a/src/test/test-condition-util.c +++ b/src/test/test-condition.c @@ -17,7 +17,7 @@ along with systemd; If not, see . ***/ -#include "condition-util.h" +#include "condition.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 d0a621c77..97d5609ad 100644 --- 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 "condition-util.h" +#include "condition.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 5f3d4ad14..844ea9862 100644 --- a/src/udev/net/link-config.h +++ b/src/udev/net/link-config.h @@ -22,11 +22,10 @@ #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; -- 2.30.2