diff options
Diffstat (limited to 'src/grp-journal')
30 files changed, 71 insertions, 53 deletions
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 <http://www.gnu.org/licenses/>. ***/ -#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 <systemd/sd-event.h> #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 <curl/curl.h> #include <stdbool.h> +#include <systemd/sd-daemon.h> + #include "basic/alloc-util.h" -#include "journal-upload.h" #include "basic/log.h" #include "basic/utf8.h" #include "basic/util.h" -#include <systemd/sd-daemon.h> + +#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 <systemd/sd-daemon.h> #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 <systemd/sd-event.h> #include <systemd/sd-journal.h> + #include "basic/time-util.h" typedef enum { diff --git a/src/grp-journal/libjournal-core/journald-audit.c b/src/grp-journal/libjournal-core/journald-audit.c index d76a460257..74ad0c017e 100644 --- a/src/grp-journal/libjournal-core/journald-audit.c +++ b/src/grp-journal/libjournal-core/journald-audit.c @@ -18,13 +18,14 @@ ***/ #include "basic/alloc-util.h" -#include "sd-journal/audit-type.h" #include "basic/fd-util.h" #include "basic/hexdecoct.h" #include "basic/io-util.h" -#include "journald-audit.h" #include "basic/missing.h" #include "basic/string-util.h" +#include "sd-journal/audit-type.h" + +#include "journald-audit.h" typedef struct MapField { const char *audit_field; diff --git a/src/grp-journal/libjournal-core/journald-audit.h b/src/grp-journal/libjournal-core/journald-audit.h index 75a4ceba3a..98c07e95e4 100644 --- a/src/grp-journal/libjournal-core/journald-audit.h +++ b/src/grp-journal/libjournal-core/journald-audit.h @@ -19,9 +19,10 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "journald-server.h" #include "basic/socket-util.h" +#include "journald-server.h" + void server_process_audit_message(Server *s, const void *buffer, size_t buffer_size, const struct ucred *ucred, const union sockaddr_union *sa, socklen_t salen); int server_open_audit(Server*s); diff --git a/src/grp-journal/libjournal-core/journald-console.c b/src/grp-journal/libjournal-core/journald-console.c index 8d8b3045c1..b1e6828dc2 100644 --- a/src/grp-journal/libjournal-core/journald-console.c +++ b/src/grp-journal/libjournal-core/journald-console.c @@ -26,13 +26,14 @@ #include "basic/fileio.h" #include "basic/formats-util.h" #include "basic/io-util.h" -#include "journald-console.h" -#include "journald-server.h" #include "basic/parse-util.h" #include "basic/process-util.h" #include "basic/stdio-util.h" #include "basic/terminal-util.h" +#include "journald-console.h" +#include "journald-server.h" + static bool prefix_timestamp(void) { static int cached_printk_time = -1; diff --git a/src/grp-journal/libjournal-core/journald-gperf.c b/src/grp-journal/libjournal-core/journald-gperf.c index d8483a3303..3da66da54f 100644 --- a/src/grp-journal/libjournal-core/journald-gperf.c +++ b/src/grp-journal/libjournal-core/journald-gperf.c @@ -31,10 +31,12 @@ #include <stddef.h> +#include <string.h> #include <sys/socket.h> + #include "shared/conf-parser.h" + #include "journald-server.h" -#include <string.h> #define TOTAL_KEYWORDS 28 #define MIN_WORD_LENGTH 12 diff --git a/src/grp-journal/libjournal-core/journald-kmsg.c b/src/grp-journal/libjournal-core/journald-kmsg.c index cac6845590..946318c184 100644 --- a/src/grp-journal/libjournal-core/journald-kmsg.c +++ b/src/grp-journal/libjournal-core/journald-kmsg.c @@ -23,21 +23,22 @@ #include <sys/socket.h> #include <unistd.h> -#include "libudev.h" +#include <libudev.h> #include <systemd/sd-messages.h> #include "basic/escape.h" #include "basic/fd-util.h" #include "basic/formats-util.h" #include "basic/io-util.h" -#include "journald-kmsg.h" -#include "journald-server.h" -#include "journald-syslog.h" #include "basic/parse-util.h" #include "basic/process-util.h" #include "basic/stdio-util.h" #include "basic/string-util.h" +#include "journald-kmsg.h" +#include "journald-server.h" +#include "journald-syslog.h" + void server_forward_kmsg( Server *s, int priority, diff --git a/src/grp-journal/libjournal-core/journald-native.c b/src/grp-journal/libjournal-core/journald-native.c index 3389d84d9e..9bfea935ad 100644 --- a/src/grp-journal/libjournal-core/journald-native.c +++ b/src/grp-journal/libjournal-core/journald-native.c @@ -27,12 +27,6 @@ #include "basic/fd-util.h" #include "basic/fs-util.h" #include "basic/io-util.h" -#include "journald-console.h" -#include "journald-kmsg.h" -#include "journald-native.h" -#include "journald-server.h" -#include "journald-syslog.h" -#include "journald-wall.h" #include "basic/memfd-util.h" #include "basic/parse-util.h" #include "basic/path-util.h" @@ -40,6 +34,13 @@ #include "basic/socket-util.h" #include "basic/string-util.h" +#include "journald-console.h" +#include "journald-kmsg.h" +#include "journald-native.h" +#include "journald-server.h" +#include "journald-syslog.h" +#include "journald-wall.h" + bool valid_user_field(const char *p, size_t l, bool allow_protected) { const char *a; diff --git a/src/grp-journal/libjournal-core/journald-rate-limit.c b/src/grp-journal/libjournal-core/journald-rate-limit.c index 60725c4884..22603bf8e6 100644 --- a/src/grp-journal/libjournal-core/journald-rate-limit.c +++ b/src/grp-journal/libjournal-core/journald-rate-limit.c @@ -22,12 +22,13 @@ #include "basic/alloc-util.h" #include "basic/hashmap.h" -#include "journald-rate-limit.h" #include "basic/list.h" #include "basic/random-util.h" #include "basic/string-util.h" #include "basic/util.h" +#include "journald-rate-limit.h" + #define POOLS_MAX 5 #define BUCKETS_MAX 127 #define GROUPS_MAX 2047 diff --git a/src/grp-journal/libjournal-core/journald-stream.h b/src/grp-journal/libjournal-core/journald-stream.h index fed48c2104..29f43b459f 100644 --- a/src/grp-journal/libjournal-core/journald-stream.h +++ b/src/grp-journal/libjournal-core/journald-stream.h @@ -22,6 +22,7 @@ typedef struct StdoutStream StdoutStream; #include "basic/fdset.h" + #include "journald-server.h" int server_open_stdout_socket(Server *s); diff --git a/src/grp-journal/libjournal-core/journald-syslog.c b/src/grp-journal/libjournal-core/journald-syslog.c index 5f632eb07b..bc793235d4 100644 --- a/src/grp-journal/libjournal-core/journald-syslog.c +++ b/src/grp-journal/libjournal-core/journald-syslog.c @@ -27,11 +27,6 @@ #include "basic/fd-util.h" #include "basic/formats-util.h" #include "basic/io-util.h" -#include "journald-console.h" -#include "journald-kmsg.h" -#include "journald-server.h" -#include "journald-syslog.h" -#include "journald-wall.h" #include "basic/process-util.h" #include "basic/selinux-util.h" #include "basic/socket-util.h" @@ -39,6 +34,12 @@ #include "basic/string-util.h" #include "basic/syslog-util.h" +#include "journald-console.h" +#include "journald-kmsg.h" +#include "journald-server.h" +#include "journald-syslog.h" +#include "journald-wall.h" + /* Warn once every 30s if we missed syslog message */ #define WARN_FORWARD_SYSLOG_MISSED_USEC (30 * USEC_PER_SEC) diff --git a/src/grp-journal/libjournal-core/journald-wall.c b/src/grp-journal/libjournal-core/journald-wall.c index fa3458fd4a..0c816de55f 100644 --- a/src/grp-journal/libjournal-core/journald-wall.c +++ b/src/grp-journal/libjournal-core/journald-wall.c @@ -19,12 +19,13 @@ #include "basic/alloc-util.h" #include "basic/formats-util.h" -#include "journald-server.h" -#include "journald-wall.h" #include "basic/process-util.h" #include "basic/string-util.h" #include "shared/utmp-wtmp.h" +#include "journald-server.h" +#include "journald-wall.h" + void server_forward_wall( Server *s, int priority, diff --git a/src/grp-journal/libjournal-core/test-audit-type.c b/src/grp-journal/libjournal-core/test-audit-type.c index 88a2e6d9d9..38917b30a5 100644 --- a/src/grp-journal/libjournal-core/test-audit-type.c +++ b/src/grp-journal/libjournal-core/test-audit-type.c @@ -17,10 +17,10 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include <stdio.h> #include <linux/audit.h> +#include <stdio.h> -#include "audit-type.h" +#include "sd-journal/audit-type.h" static void print_audit_label(int i) { const char *name; diff --git a/src/grp-journal/libjournal-core/test-catalog.c b/src/grp-journal/libjournal-core/test-catalog.c index 3a26909136..73ffb16104 100644 --- a/src/grp-journal/libjournal-core/test-catalog.c +++ b/src/grp-journal/libjournal-core/test-catalog.c @@ -26,13 +26,13 @@ #include <systemd/sd-messages.h> #include "basic/alloc-util.h" -#include "catalog.h" #include "basic/fd-util.h" #include "basic/fileio.h" #include "basic/log.h" #include "basic/macro.h" #include "basic/string-util.h" #include "basic/util.h" +#include "sd-journal/catalog.h" static const char *catalog_dirs[] = { CATALOG_DIR, diff --git a/src/grp-journal/libjournal-core/test-compress-benchmark.c b/src/grp-journal/libjournal-core/test-compress-benchmark.c index 99d7c7d103..4292e4f8cb 100644 --- a/src/grp-journal/libjournal-core/test-compress-benchmark.c +++ b/src/grp-journal/libjournal-core/test-compress-benchmark.c @@ -18,12 +18,12 @@ ***/ #include "basic/alloc-util.h" -#include "compress.h" #include "basic/macro.h" #include "basic/parse-util.h" #include "basic/random-util.h" #include "basic/string-util.h" #include "basic/util.h" +#include "sd-journal/compress.h" typedef int (compress_t)(const void *src, uint64_t src_size, void *dst, size_t dst_alloc_size, size_t *dst_size); diff --git a/src/grp-journal/libjournal-core/test-journal-enum.c b/src/grp-journal/libjournal-core/test-journal-enum.c index b960c5d8cd..588e12c800 100644 --- a/src/grp-journal/libjournal-core/test-journal-enum.c +++ b/src/grp-journal/libjournal-core/test-journal-enum.c @@ -21,9 +21,9 @@ #include <systemd/sd-journal.h> -#include "journal-internal.h" #include "basic/log.h" #include "basic/macro.h" +#include "sd-journal/journal-internal.h" int main(int argc, char *argv[]) { unsigned n = 0; diff --git a/src/grp-journal/libjournal-core/test-journal-flush.c b/src/grp-journal/libjournal-core/test-journal-flush.c index 6364a395b8..66ae8f83c4 100644 --- a/src/grp-journal/libjournal-core/test-journal-flush.c +++ b/src/grp-journal/libjournal-core/test-journal-flush.c @@ -22,10 +22,10 @@ #include <systemd/sd-journal.h> #include "basic/alloc-util.h" -#include "journal-file.h" -#include "journal-internal.h" #include "basic/macro.h" #include "basic/string-util.h" +#include "sd-journal/journal-file.h" +#include "sd-journal/journal-internal.h" int main(int argc, char *argv[]) { _cleanup_free_ char *fn = NULL; diff --git a/src/grp-journal/libjournal-core/test-journal-interleaving.c b/src/grp-journal/libjournal-core/test-journal-interleaving.c index 753c92cdbc..004394d18a 100644 --- a/src/grp-journal/libjournal-core/test-journal-interleaving.c +++ b/src/grp-journal/libjournal-core/test-journal-interleaving.c @@ -24,12 +24,12 @@ #include <systemd/sd-journal.h> #include "basic/alloc-util.h" -#include "journal-file.h" -#include "journal-vacuum.h" #include "basic/log.h" #include "basic/parse-util.h" #include "basic/rm-rf.h" #include "basic/util.h" +#include "sd-journal/journal-file.h" +#include "sd-journal/journal-vacuum.h" /* This program tests skipping around in a multi-file journal. */ diff --git a/src/grp-journal/libjournal-core/test-journal-match.c b/src/grp-journal/libjournal-core/test-journal-match.c index 42043b229f..967e30c46a 100644 --- a/src/grp-journal/libjournal-core/test-journal-match.c +++ b/src/grp-journal/libjournal-core/test-journal-match.c @@ -22,10 +22,10 @@ #include <systemd/sd-journal.h> #include "basic/alloc-util.h" -#include "journal-internal.h" #include "basic/log.h" #include "basic/string-util.h" #include "basic/util.h" +#include "sd-journal/journal-internal.h" int main(int argc, char *argv[]) { _cleanup_(sd_journal_closep) sd_journal*j = NULL; diff --git a/src/grp-journal/libjournal-core/test-journal-stream.c b/src/grp-journal/libjournal-core/test-journal-stream.c index e5a4a02087..b71c44ef56 100644 --- a/src/grp-journal/libjournal-core/test-journal-stream.c +++ b/src/grp-journal/libjournal-core/test-journal-stream.c @@ -23,13 +23,13 @@ #include <systemd/sd-journal.h> #include "basic/alloc-util.h" -#include "journal-file.h" -#include "journal-internal.h" #include "basic/log.h" #include "basic/macro.h" #include "basic/parse-util.h" #include "basic/rm-rf.h" #include "basic/util.h" +#include "sd-journal/journal-file.h" +#include "sd-journal/journal-internal.h" #define N_ENTRIES 200 diff --git a/src/grp-journal/libjournal-core/test-journal-syslog.c b/src/grp-journal/libjournal-core/test-journal-syslog.c index 91bc0ec99e..4756126478 100644 --- a/src/grp-journal/libjournal-core/test-journal-syslog.c +++ b/src/grp-journal/libjournal-core/test-journal-syslog.c @@ -18,10 +18,11 @@ ***/ #include "basic/alloc-util.h" -#include "journald-syslog.h" #include "basic/macro.h" #include "basic/string-util.h" +#include "journald-syslog.h" + static void test_syslog_parse_identifier(const char* str, const char *ident, const char*pid, int ret) { const char *buf = str; diff --git a/src/grp-journal/libjournal-core/test-journal-verify.c b/src/grp-journal/libjournal-core/test-journal-verify.c index 7a253c2b85..485315c118 100644 --- a/src/grp-journal/libjournal-core/test-journal-verify.c +++ b/src/grp-journal/libjournal-core/test-journal-verify.c @@ -22,12 +22,12 @@ #include <unistd.h> #include "basic/fd-util.h" -#include "journal-file.h" -#include "journal-verify.h" #include "basic/log.h" #include "basic/rm-rf.h" #include "basic/terminal-util.h" #include "basic/util.h" +#include "sd-journal/journal-file.h" +#include "sd-journal/journal-verify.h" #define N_ENTRIES 6000 #define RANDOM_RANGE 77 diff --git a/src/grp-journal/libjournal-core/test-journal.c b/src/grp-journal/libjournal-core/test-journal.c index a8ee802220..05de15f0c0 100644 --- a/src/grp-journal/libjournal-core/test-journal.c +++ b/src/grp-journal/libjournal-core/test-journal.c @@ -20,11 +20,11 @@ #include <fcntl.h> #include <unistd.h> -#include "journal-authenticate.h" -#include "journal-file.h" -#include "journal-vacuum.h" #include "basic/log.h" #include "basic/rm-rf.h" +#include "sd-journal/journal-authenticate.h" +#include "sd-journal/journal-file.h" +#include "sd-journal/journal-vacuum.h" static bool arg_keep = false; diff --git a/src/grp-journal/libjournal-core/test-mmap-cache.c b/src/grp-journal/libjournal-core/test-mmap-cache.c index 7b7c67cca4..3eb5444480 100644 --- a/src/grp-journal/libjournal-core/test-mmap-cache.c +++ b/src/grp-journal/libjournal-core/test-mmap-cache.c @@ -25,8 +25,8 @@ #include "basic/fd-util.h" #include "basic/fileio.h" #include "basic/macro.h" -#include "mmap-cache.h" #include "basic/util.h" +#include "sd-journal/mmap-cache.h" int main(int argc, char *argv[]) { int x, y, z, r; diff --git a/src/grp-journal/systemd-journald/journald.c b/src/grp-journal/systemd-journald/journald.c index cfeb9ea48e..cd887feed8 100644 --- a/src/grp-journal/systemd-journald/journald.c +++ b/src/grp-journal/systemd-journald/journald.c @@ -24,11 +24,10 @@ #include "basic/formats-util.h" #include "basic/sigbus.h" -#include "sd-journal/journal-authenticate.h" - #include "journald-kmsg.h" #include "journald-server.h" #include "journald-syslog.h" +#include "sd-journal/journal-authenticate.h" int main(int argc, char *argv[]) { Server server; |