Browse Source

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.
keep-around/964a6d9fb555cc86528eb1cc1f6d044f85584842
Lennart Poettering 8 years ago
parent
commit
134e56dcc5
  1. 2
      .gitignore
  2. 12
      Makefile.am
  3. 2
      src/core/unit.h
  4. 2
      src/libsystemd-network/network-internal.c
  5. 2
      src/libsystemd-network/network-internal.h
  6. 1
      src/network/networkd-netdev.h
  7. 2
      src/network/networkd.h
  8. 2
      src/shared/condition.c
  9. 0
      src/shared/condition.h
  10. 2
      src/test/test-condition.c
  11. 2
      src/test/test-tables.c
  12. 5
      src/udev/net/link-config.h

2
.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

12
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 \

2
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"

2
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) {

2
src/libsystemd-network/network-internal.h

@ -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,

1
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;

2
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

2
src/shared/condition-util.c → 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;

0
src/shared/condition-util.h → src/shared/condition.h

2
src/test/test-condition-util.c → src/test/test-condition.c

@ -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"

2
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"

5
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;

Loading…
Cancel
Save