From 1e094703035c31b0be7baf60d48a67efde185dab Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Sat, 30 Sep 2023 16:09:16 +0900 Subject: [PATCH] journald: move and rename journal/managed-journal-file.[ch] -> shared/journal-file-util.[ch] The files are used by both journald and journal-remote. Let's move them to src/shared. --- src/journal-remote/journal-remote-write.c | 1 + src/journal-remote/journal-remote-write.h | 2 +- src/journal-remote/journal-remote.c | 2 +- src/journal/journald-server.c | 1 + src/journal/journald-server.h | 2 +- src/journal/meson.build | 1 - src/journal/test-journal-append.c | 2 +- src/journal/test-journal-flush.c | 2 +- src/journal/test-journal-interleaving.c | 2 +- src/journal/test-journal-stream.c | 2 +- src/journal/test-journal-verify.c | 2 +- src/journal/test-journal.c | 2 +- .../managed-journal-file.c => shared/journal-file-util.c} | 2 +- .../managed-journal-file.h => shared/journal-file-util.h} | 0 src/shared/meson.build | 1 + 15 files changed, 13 insertions(+), 11 deletions(-) rename src/{journal/managed-journal-file.c => shared/journal-file-util.c} (99%) rename src/{journal/managed-journal-file.h => shared/journal-file-util.h} (100%) diff --git a/src/journal-remote/journal-remote-write.c b/src/journal-remote/journal-remote-write.c index f972b1fd479..d794277b279 100644 --- a/src/journal-remote/journal-remote-write.c +++ b/src/journal-remote/journal-remote-write.c @@ -3,6 +3,7 @@ #include #include "alloc-util.h" +#include "journal-file-util.h" #include "journal-remote.h" #include "path-util.h" #include "stat-util.h" diff --git a/src/journal-remote/journal-remote-write.h b/src/journal-remote/journal-remote-write.h index 65ec2a599a3..005eaace4eb 100644 --- a/src/journal-remote/journal-remote-write.h +++ b/src/journal-remote/journal-remote-write.h @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once +#include "journal-file.h" #include "journal-importer.h" -#include "managed-journal-file.h" typedef struct RemoteServer RemoteServer; diff --git a/src/journal-remote/journal-remote.c b/src/journal-remote/journal-remote.c index 16f74ef066e..06be2d08e2b 100644 --- a/src/journal-remote/journal-remote.c +++ b/src/journal-remote/journal-remote.c @@ -14,11 +14,11 @@ #include "errno-util.h" #include "escape.h" #include "fd-util.h" +#include "journal-file-util.h" #include "journal-remote-write.h" #include "journal-remote.h" #include "journald-native.h" #include "macro.h" -#include "managed-journal-file.h" #include "parse-util.h" #include "parse-helpers.h" #include "process-util.h" diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c index 3b07a4bf0d2..615b3c6c6b1 100644 --- a/src/journal/journald-server.c +++ b/src/journal/journald-server.c @@ -30,6 +30,7 @@ #include "initrd-util.h" #include "io-util.h" #include "journal-authenticate.h" +#include "journal-file-util.h" #include "journal-internal.h" #include "journal-vacuum.h" #include "journald-audit.h" diff --git a/src/journal/journald-server.h b/src/journal/journald-server.h index 4e9a67c306a..2a176761ed4 100644 --- a/src/journal/journald-server.h +++ b/src/journal/journald-server.h @@ -11,11 +11,11 @@ typedef struct Server Server; #include "common-signal.h" #include "conf-parser.h" #include "hashmap.h" +#include "journal-file.h" #include "journald-context.h" #include "journald-rate-limit.h" #include "journald-stream.h" #include "list.h" -#include "managed-journal-file.h" #include "prioq.h" #include "ratelimit.h" #include "time-util.h" diff --git a/src/journal/meson.build b/src/journal/meson.build index 42b3131f658..6ae5cfbf9d9 100644 --- a/src/journal/meson.build +++ b/src/journal/meson.build @@ -12,7 +12,6 @@ sources = files( 'journald-stream.c', 'journald-syslog.c', 'journald-wall.c', - 'managed-journal-file.c', ) sources += custom_target( diff --git a/src/journal/test-journal-append.c b/src/journal/test-journal-append.c index f382b1bd14c..fbbf44add42 100644 --- a/src/journal/test-journal-append.c +++ b/src/journal/test-journal-append.c @@ -9,8 +9,8 @@ #include "fd-util.h" #include "fs-util.h" #include "io-util.h" +#include "journal-file-util.h" #include "log.h" -#include "managed-journal-file.h" #include "mmap-cache.h" #include "parse-util.h" #include "random-util.h" diff --git a/src/journal/test-journal-flush.c b/src/journal/test-journal-flush.c index 53ba72bbd27..b5956d24fc2 100644 --- a/src/journal/test-journal-flush.c +++ b/src/journal/test-journal-flush.c @@ -7,9 +7,9 @@ #include "alloc-util.h" #include "chattr-util.h" +#include "journal-file-util.h" #include "journal-internal.h" #include "macro.h" -#include "managed-journal-file.h" #include "path-util.h" #include "rm-rf.h" #include "string-util.h" diff --git a/src/journal/test-journal-interleaving.c b/src/journal/test-journal-interleaving.c index 81073465bf0..d8588759d1a 100644 --- a/src/journal/test-journal-interleaving.c +++ b/src/journal/test-journal-interleaving.c @@ -9,10 +9,10 @@ #include "alloc-util.h" #include "chattr-util.h" #include "io-util.h" +#include "journal-file-util.h" #include "journal-vacuum.h" #include "log.h" #include "logs-show.h" -#include "managed-journal-file.h" #include "parse-util.h" #include "rm-rf.h" #include "tests.h" diff --git a/src/journal/test-journal-stream.c b/src/journal/test-journal-stream.c index 7de173f5f3b..2897de49051 100644 --- a/src/journal/test-journal-stream.c +++ b/src/journal/test-journal-stream.c @@ -8,10 +8,10 @@ #include "alloc-util.h" #include "chattr-util.h" #include "io-util.h" +#include "journal-file-util.h" #include "journal-internal.h" #include "log.h" #include "macro.h" -#include "managed-journal-file.h" #include "parse-util.h" #include "rm-rf.h" #include "tests.h" diff --git a/src/journal/test-journal-verify.c b/src/journal/test-journal-verify.c index 8a77f919c5d..7853b364956 100644 --- a/src/journal/test-journal-verify.c +++ b/src/journal/test-journal-verify.c @@ -7,9 +7,9 @@ #include "chattr-util.h" #include "fd-util.h" #include "io-util.h" +#include "journal-file-util.h" #include "journal-verify.h" #include "log.h" -#include "managed-journal-file.h" #include "mmap-cache.h" #include "rm-rf.h" #include "strv.h" diff --git a/src/journal/test-journal.c b/src/journal/test-journal.c index e89d982a786..a0916a0a245 100644 --- a/src/journal/test-journal.c +++ b/src/journal/test-journal.c @@ -6,9 +6,9 @@ #include "chattr-util.h" #include "io-util.h" #include "journal-authenticate.h" +#include "journal-file-util.h" #include "journal-vacuum.h" #include "log.h" -#include "managed-journal-file.h" #include "rm-rf.h" #include "tests.h" diff --git a/src/journal/managed-journal-file.c b/src/shared/journal-file-util.c similarity index 99% rename from src/journal/managed-journal-file.c rename to src/shared/journal-file-util.c index 34f34976217..90737fb8a85 100644 --- a/src/journal/managed-journal-file.c +++ b/src/shared/journal-file-util.c @@ -9,7 +9,7 @@ #include "fd-util.h" #include "format-util.h" #include "journal-authenticate.h" -#include "managed-journal-file.h" +#include "journal-file-util.h" #include "path-util.h" #include "random-util.h" #include "set.h" diff --git a/src/journal/managed-journal-file.h b/src/shared/journal-file-util.h similarity index 100% rename from src/journal/managed-journal-file.h rename to src/shared/journal-file-util.h diff --git a/src/shared/meson.build b/src/shared/meson.build index 47ebbea54e4..3df178bfa1f 100644 --- a/src/shared/meson.build +++ b/src/shared/meson.build @@ -93,6 +93,7 @@ shared_sources = files( 'install.c', 'ip-protocol-list.c', 'ipvlan-util.c', + 'journal-file-util.c', 'journal-importer.c', 'journal-util.c', 'json.c',