From 272b48187cee0b42b6e936ad2c045f13b391f3ad Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Mon, 1 Aug 2016 16:33:32 -0400 Subject: find src \( -name '*.h' -o -name '*.c' \) -type f -exec ./fixup_includes {} \; --- .../grp-remote/systemd-journal-remote/journal-remote-parse.c | 5 +++-- .../grp-remote/systemd-journal-remote/journal-remote-write.c | 1 + .../grp-remote/systemd-journal-remote/journal-remote-write.h | 2 +- src/grp-journal/grp-remote/systemd-journal-remote/journal-remote.h | 3 ++- .../grp-remote/systemd-journal-upload/journal-upload-journal.c | 6 ++++-- src/grp-journal/grp-remote/systemd-journal-upload/journal-upload.c | 5 +++-- src/grp-journal/grp-remote/systemd-journal-upload/journal-upload.h | 1 + 7 files changed, 15 insertions(+), 8 deletions(-) (limited to 'src/grp-journal/grp-remote') diff --git a/src/grp-journal/grp-remote/systemd-journal-remote/journal-remote-parse.c b/src/grp-journal/grp-remote/systemd-journal-remote/journal-remote-parse.c index ec5358fb97..c71fedd816 100644 --- a/src/grp-journal/grp-remote/systemd-journal-remote/journal-remote-parse.c +++ b/src/grp-journal/grp-remote/systemd-journal-remote/journal-remote-parse.c @@ -19,10 +19,11 @@ #include "basic/alloc-util.h" #include "basic/fd-util.h" -#include "journal-remote-parse.h" -#include "journald-native.h" #include "basic/parse-util.h" #include "basic/string-util.h" +#include "journald-native.h" + +#include "journal-remote-parse.h" #define LINE_CHUNK 8*1024u diff --git a/src/grp-journal/grp-remote/systemd-journal-remote/journal-remote-write.c b/src/grp-journal/grp-remote/systemd-journal-remote/journal-remote-write.c index 82292fd240..4e05eda103 100644 --- a/src/grp-journal/grp-remote/systemd-journal-remote/journal-remote-write.c +++ b/src/grp-journal/grp-remote/systemd-journal-remote/journal-remote-write.c @@ -18,6 +18,7 @@ ***/ #include "basic/alloc-util.h" + #include "journal-remote.h" int iovw_put(struct iovec_wrapper *iovw, void* data, size_t len) { diff --git a/src/grp-journal/grp-remote/systemd-journal-remote/journal-remote-write.h b/src/grp-journal/grp-remote/systemd-journal-remote/journal-remote-write.h index 53ba45fc04..a61434ca75 100644 --- a/src/grp-journal/grp-remote/systemd-journal-remote/journal-remote-write.h +++ b/src/grp-journal/grp-remote/systemd-journal-remote/journal-remote-write.h @@ -19,7 +19,7 @@ along with systemd; If not, see . ***/ -#include "journal-file.h" +#include "sd-journal/journal-file.h" typedef struct RemoteServer RemoteServer; diff --git a/src/grp-journal/grp-remote/systemd-journal-remote/journal-remote.h b/src/grp-journal/grp-remote/systemd-journal-remote/journal-remote.h index 2e8d5999b0..6abfc1019d 100644 --- a/src/grp-journal/grp-remote/systemd-journal-remote/journal-remote.h +++ b/src/grp-journal/grp-remote/systemd-journal-remote/journal-remote.h @@ -22,9 +22,10 @@ #include #include "basic/hashmap.h" +#include "microhttpd-util.h" + #include "journal-remote-parse.h" #include "journal-remote-write.h" -#include "microhttpd-util.h" typedef struct MHDDaemonWrapper MHDDaemonWrapper; diff --git a/src/grp-journal/grp-remote/systemd-journal-upload/journal-upload-journal.c b/src/grp-journal/grp-remote/systemd-journal-upload/journal-upload-journal.c index eddfc384fa..61d287da97 100644 --- a/src/grp-journal/grp-remote/systemd-journal-upload/journal-upload-journal.c +++ b/src/grp-journal/grp-remote/systemd-journal-upload/journal-upload-journal.c @@ -20,12 +20,14 @@ #include #include +#include + #include "basic/alloc-util.h" -#include "journal-upload.h" #include "basic/log.h" #include "basic/utf8.h" #include "basic/util.h" -#include + +#include "journal-upload.h" /** * Write up to size bytes to buf. Return negative on error, and number of diff --git a/src/grp-journal/grp-remote/systemd-journal-upload/journal-upload.c b/src/grp-journal/grp-remote/systemd-journal-upload/journal-upload.c index 643f44cd86..82d8331e76 100644 --- a/src/grp-journal/grp-remote/systemd-journal-upload/journal-upload.c +++ b/src/grp-journal/grp-remote/systemd-journal-upload/journal-upload.c @@ -26,13 +26,11 @@ #include #include "basic/alloc-util.h" -#include "shared/conf-parser.h" #include "basic/def.h" #include "basic/fd-util.h" #include "basic/fileio.h" #include "basic/formats-util.h" #include "basic/glob-util.h" -#include "journal-upload.h" #include "basic/log.h" #include "basic/mkdir.h" #include "basic/parse-util.h" @@ -40,6 +38,9 @@ #include "basic/signal-util.h" #include "basic/string-util.h" #include "basic/util.h" +#include "shared/conf-parser.h" + +#include "journal-upload.h" #define PRIV_KEY_FILE CERTIFICATE_ROOT "/private/journal-upload.pem" #define CERT_FILE CERTIFICATE_ROOT "/certs/journal-upload.pem" diff --git a/src/grp-journal/grp-remote/systemd-journal-upload/journal-upload.h b/src/grp-journal/grp-remote/systemd-journal-upload/journal-upload.h index 0b0336c84b..2decc7b22e 100644 --- a/src/grp-journal/grp-remote/systemd-journal-upload/journal-upload.h +++ b/src/grp-journal/grp-remote/systemd-journal-upload/journal-upload.h @@ -4,6 +4,7 @@ #include #include + #include "basic/time-util.h" typedef enum { -- cgit v1.2.3-54-g00ecf