summaryrefslogtreecommitdiff
path: root/src/libsystemd
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2015-10-26 23:32:16 +0100
committerLennart Poettering <lennart@poettering.net>2015-10-27 13:25:57 +0100
commit430f0182b72373145c839dbfe99d2382855cb8f8 (patch)
treeda86be6519a80516ee477cb8bb5a1612eb52ce15 /src/libsystemd
parentaffb60b1ef0cb48388d23360c6f3b043c50f6b8c (diff)
src/basic: rename audit.[ch] → audit-util.[ch] and capability.[ch] → capability-util.[ch]
The files are named too generically, so that they might conflict with the upstream project headers. Hence, let's add a "-util" suffix, to clarify that this are just our utility headers and not any official upstream headers.
Diffstat (limited to 'src/libsystemd')
-rw-r--r--src/libsystemd/sd-bus/bus-control.c2
-rw-r--r--src/libsystemd/sd-bus/bus-creds.c4
-rw-r--r--src/libsystemd/sd-bus/bus-dump.c2
-rw-r--r--src/libsystemd/sd-bus/bus-kernel.c2
4 files changed, 5 insertions, 5 deletions
diff --git a/src/libsystemd/sd-bus/bus-control.c b/src/libsystemd/sd-bus/bus-control.c
index e68207ae07..dc4ac88712 100644
--- a/src/libsystemd/sd-bus/bus-control.c
+++ b/src/libsystemd/sd-bus/bus-control.c
@@ -32,7 +32,7 @@
#include "bus-internal.h"
#include "bus-message.h"
#include "bus-util.h"
-#include "capability.h"
+#include "capability-util.h"
#include "string-util.h"
#include "strv.h"
#include "bus-control.h"
diff --git a/src/libsystemd/sd-bus/bus-creds.c b/src/libsystemd/sd-bus/bus-creds.c
index d7a7b6e5bb..d291da8934 100644
--- a/src/libsystemd/sd-bus/bus-creds.c
+++ b/src/libsystemd/sd-bus/bus-creds.c
@@ -22,12 +22,12 @@
#include <linux/capability.h>
#include <stdlib.h>
-#include "audit.h"
+#include "audit-util.h"
#include "bus-creds.h"
#include "bus-label.h"
#include "bus-message.h"
#include "bus-util.h"
-#include "capability.h"
+#include "capability-util.h"
#include "cgroup-util.h"
#include "fd-util.h"
#include "fileio.h"
diff --git a/src/libsystemd/sd-bus/bus-dump.c b/src/libsystemd/sd-bus/bus-dump.c
index 02c9ff8f2f..ab4e9cbc06 100644
--- a/src/libsystemd/sd-bus/bus-dump.c
+++ b/src/libsystemd/sd-bus/bus-dump.c
@@ -24,7 +24,7 @@
#include "bus-message.h"
#include "bus-type.h"
#include "cap-list.h"
-#include "capability.h"
+#include "capability-util.h"
#include "fileio.h"
#include "formats-util.h"
#include "locale-util.h"
diff --git a/src/libsystemd/sd-bus/bus-kernel.c b/src/libsystemd/sd-bus/bus-kernel.c
index 6f396b7953..a455259007 100644
--- a/src/libsystemd/sd-bus/bus-kernel.c
+++ b/src/libsystemd/sd-bus/bus-kernel.c
@@ -40,7 +40,7 @@
#include "bus-label.h"
#include "bus-message.h"
#include "bus-util.h"
-#include "capability.h"
+#include "capability-util.h"
#include "fd-util.h"
#include "fileio.h"
#include "formats-util.h"