summaryrefslogtreecommitdiff
path: root/src/journal
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/journal
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/journal')
-rw-r--r--src/journal/coredump.c2
-rw-r--r--src/journal/journald-server.c1
-rw-r--r--src/journal/journald-server.h4
3 files changed, 4 insertions, 3 deletions
diff --git a/src/journal/coredump.c b/src/journal/coredump.c
index 257a665819..b9ece73a81 100644
--- a/src/journal/coredump.c
+++ b/src/journal/coredump.c
@@ -34,7 +34,7 @@
#include "sd-login.h"
#include "acl-util.h"
-#include "capability.h"
+#include "capability-util.h"
#include "cgroup-util.h"
#include "compress.h"
#include "conf-parser.h"
diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
index ab213f705d..442fbb8ecd 100644
--- a/src/journal/journald-server.c
+++ b/src/journal/journald-server.c
@@ -34,6 +34,7 @@
#include "sd-messages.h"
#include "acl-util.h"
+#include "audit-util.h"
#include "cgroup-util.h"
#include "conf-parser.h"
#include "dirent-util.h"
diff --git a/src/journal/journald-server.h b/src/journal/journald-server.h
index 535c0ab9ab..a2631c6017 100644
--- a/src/journal/journald-server.h
+++ b/src/journal/journald-server.h
@@ -25,9 +25,9 @@
#include <sys/types.h>
#include "sd-event.h"
-#include "journal-file.h"
+
#include "hashmap.h"
-#include "audit.h"
+#include "journal-file.h"
#include "journald-rate-limit.h"
#include "list.h"