SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

journal-remote: Clean up includes

Browse Source 
Split out of #37344.
This commit is contained in:
Daan De Meyer
2025-05-21 18:10:19 +02:00
parent 9412e9e97b
commit 6c68f5d4ba
18 changed files with 37 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/journal-remote/fuzz-journal-remote.c
+1 -3
View File
@@ -1,12 +1,11 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <sys/mman.h>
#include <stdlib.h>
#include "sd-journal.h"
#include "env-util.h"
#include "fd-util.h"
#include "fileio.h"
#include "fs-util.h"
#include "fuzz.h"
#include "journal-remote.h"
@@ -14,7 +13,6 @@
#include "memfd-util.h"
#include "path-util.h"
#include "rm-rf.h"
#include "strv.h"
#include "tests.h"
#include "tmpfile-util.h"
src/journal-remote/journal-compression-util.c
+3
View File
@@ -2,8 +2,11 @@
#include "alloc-util.h"
#include "extract-word.h"
#include "hashmap.h"
#include "journal-compression-util.h"
#include "log.h"
#include "parse-util.h"
#include "string-util.h"
static int compression_config_put(OrderedHashmap **configs, Compression c, int level) {
assert(configs);
src/journal-remote/journal-compression-util.h
+2 -2
View File
@@ -2,8 +2,8 @@
#pragma once
#include "compress.h"
#include "conf-parser.h"
#include "hashmap.h"
#include "conf-parser-forward.h"
#include "forward.h"
typedef struct CompressionConfig {
Compression algorithm;
src/journal-remote/journal-gatewayd.c
+1 -2
View File
@@ -6,7 +6,6 @@
#include <stdlib.h>
#include <string.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <unistd.h>
#include "sd-bus.h"
@@ -16,7 +15,6 @@
#include "alloc-util.h"
#include "build.h"
#include "bus-locator.h"
#include "bus-util.h"
#include "errno-util.h"
#include "fd-util.h"
#include "fileio.h"
@@ -34,6 +32,7 @@
#include "parse-util.h"
#include "pretty-print.h"
#include "signal-util.h"
#include "string-util.h"
#include "time-util.h"
#include "tmpfile-util.h"
src/journal-remote/journal-header-util.c
+2
View File
@@ -2,7 +2,9 @@
#include "alloc-util.h"
#include "escape.h"
#include "hashmap.h"
#include "journal-header-util.h"
#include "log.h"
#include "string-util.h"
#include "strv.h"
src/journal-remote/journal-header-util.h
+2 -2
View File
@@ -1,8 +1,8 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include "conf-parser.h"
#include "hashmap.h"
#include "conf-parser-forward.h"
#include "forward.h"
bool header_value_is_valid(const char *value);
src/journal-remote/journal-remote-main.c
+6 -4
View File
@@ -4,31 +4,33 @@
#include <unistd.h>
#include "sd-daemon.h"
#include "sd-event.h"
#include "alloc-util.h"
#include "build.h"
#include "conf-parser.h"
#include "constants.h"
#include "daemon-util.h"
#include "extract-word.h"
#include "fd-util.h"
#include "format-util.h"
#include "fileio.h"
#include "hashmap.h"
#include "journal-compression-util.h"
#include "journal-remote.h"
#include "journal-remote-write.h"
#include "logs-show.h"
#include "main-func.h"
#include "memory-util.h"
#include "microhttpd-util.h"
#include "parse-argument.h"
#include "parse-helpers.h"
#include "parse-util.h"
#include "pretty-print.h"
#include "process-util.h"
#include "rlimit-util.h"
#include "signal-util.h"
#include "socket-netlink.h"
#include "socket-util.h"
#include "stat-util.h"
#include "string-table.h"
#include "string-util.h"
#include "strv.h"
#define PRIV_KEY_FILE CERTIFICATE_ROOT "/private/journal-remote.pem"
src/journal-remote/journal-remote-parse.c
+2 -3
View File
@@ -1,11 +1,10 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "sd-event.h"
#include "alloc-util.h"
#include "fd-util.h"
#include "journal-remote-parse.h"
#include "log.h"
#include "parse-util.h"
#include "string-util.h"
RemoteSource* source_free(RemoteSource *source) {
if (!source)
src/journal-remote/journal-remote-parse.h
+1 -2
View File
@@ -1,9 +1,8 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include "sd-event.h"
#include "compress.h"
#include "forward.h"
#include "journal-importer.h"
#include "journal-remote-write.h"
src/journal-remote/journal-remote-write.c
+2 -2
View File
@@ -1,10 +1,10 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <libgen.h>
#include "alloc-util.h"
#include "hashmap.h"
#include "journal-file-util.h"
#include "journal-remote.h"
#include "journal-vacuum.h"
#include "log.h"
#include "path-util.h"
#include "stat-util.h"
src/journal-remote/journal-remote-write.h
-1
View File
@@ -2,7 +2,6 @@
#pragma once
#include "journal-file.h"
#include "journal-importer.h"
typedef struct RemoteServer RemoteServer;
src/journal-remote/journal-remote.c
+3 -12
View File
@@ -1,31 +1,22 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <fcntl.h>
#include <stdint.h>
#include <stdlib.h>
#include <sys/prctl.h>
#include "sd-daemon.h"
#include "sd-event.h"
#include "af-list.h"
#include "alloc-util.h"
#include "constants.h"
#include "errno-util.h"
#include "escape.h"
#include "fd-util.h"
#include "hash-funcs.h"
#include "hashmap.h"
#include "journal-file-util.h"
#include "journal-remote.h"
#include "journal-remote-write.h"
#include "log.h"
#include "macro.h"
#include "parse-helpers.h"
#include "parse-util.h"
#include "process-util.h"
#include "socket-util.h"
#include "stdio-util.h"
#include "string-util.h"
#include "strv.h"
#define REMOTE_JOURNAL_PATH "/var/log/journal/remote"
src/journal-remote/journal-remote.h
+3 -6
View File
@@ -1,14 +1,11 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include "sd-event.h"
#include "hashmap.h"
#include "forward.h"
#include "journal-remote-parse.h"
#include "journal-remote-write.h"
#include "journal-vacuum.h"
struct RemoteServer {
typedef struct RemoteServer {
RemoteSource **sources;
size_t active;
@@ -26,7 +23,7 @@ struct RemoteServer {
JournalFileFlags file_flags;
bool check_trust;
JournalMetrics metrics;
};
} RemoteServer;
extern RemoteServer *journal_remote_server_global;
/* Used for MHD_OPTION_CONNECTION_MEMORY_LIMIT and header parsing cap */
src/journal-remote/journal-upload-journal.c
+3 -1
View File
@@ -1,14 +1,16 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <curl/curl.h>
#include <stdbool.h>
#include "sd-daemon.h"
#include "sd-event.h"
#include "sd-journal.h"
#include "alloc-util.h"
#include "journal-upload.h"
#include "log.h"
#include "string-util.h"
#include "time-util.h"
#include "utf8.h"
/**
src/journal-remote/journal-upload.c
+4 -5
View File
@@ -3,23 +3,23 @@
#include <fcntl.h>
#include <getopt.h>
#include <stdio.h>
#include <sys/stat.h>
#include <unistd.h>
#include "sd-daemon.h"
#include "sd-event.h"
#include "alloc-util.h"
#include "build.h"
#include "conf-parser.h"
#include "constants.h"
#include "daemon-util.h"
#include "env-file.h"
#include "escape.h"
#include "extract-word.h"
#include "fd-util.h"
#include "fileio.h"
#include "format-util.h"
#include "fs-util.h"
#include "glob-util.h"
#include "hashmap.h"
#include "journal-header-util.h"
#include "journal-upload.h"
#include "journal-util.h"
@@ -31,10 +31,9 @@
#include "parse-helpers.h"
#include "pretty-print.h"
#include "process-util.h"
#include "rlimit-util.h"
#include "signal-util.h"
#include "string-util.h"
#include "strv.h"
#include "time-util.h"
#include "tmpfile-util.h"
#include "version.h"
src/journal-remote/journal-upload.h
+1 -5
View File
@@ -3,13 +3,9 @@
#pragma once
#include <curl/curl.h>
#include <inttypes.h>
#include "sd-event.h"
#include "sd-journal.h"
#include "forward.h"
#include "journal-compression-util.h"
#include "time-util.h"
typedef enum {
ENTRY_CURSOR = 0, /* Nothing actually written yet. */
src/journal-remote/microhttpd-util.c
-2
View File
@@ -1,6 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <stddef.h>
#include <stdio.h>
#if HAVE_GNUTLS
@@ -10,7 +9,6 @@
#include "alloc-util.h"
#include "log.h"
#include "macro.h"
#include "microhttpd-util.h"
#include "string-util.h"
#include "strv.h"
src/journal-remote/microhttpd-util.h
+1 -2
View File
@@ -4,9 +4,8 @@
#if HAVE_MICROHTTPD
#include <microhttpd.h>
#include <stdarg.h>
#include "memory-util.h"
#include "forward.h"
/* Those defines are added when options are renamed. If the old names
* are not '#define'd, then they are not deprecated yet and there are