journald: move and rename journal/managed-journal-file.[ch] -> shared/journal-file...

The files are used by both journald and journal-remote.
Let's move them to src/shared.

diff --git a/src/journal-remote/journal-remote-write.c b/src/journal-remote/journal-remote-write.c
index f972b1fd479d0f44efbf0576bdc02fb98103428e..d794277b2793b866419f406ecd684338c5fe8d93 100644 (file)
--- a/src/journal-remote/journal-remote-write.c
+++ b/src/journal-remote/journal-remote-write.c
@@ -3,6 +3,7 @@
 #include <libgen.h>
 
 #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 65ec2a599a3d1db25f67288e52f003f733c70ee7..005eaace4eb8e7e6218a507bfc6e9d14bab64371 100644 (file)
--- 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 16f74ef066e26d1b25bbc0f50ffd97fdbb8d85e8..06be2d08e2bb5e143c754c3898bd2979038ef6e3 100644 (file)
--- 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 3b07a4bf0d268ef85060fd25253aa7cb1a1f9a21..615b3c6c6b10e88909a6835da36151973aae531d 100644 (file)
--- 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 4e9a67c306a958a6b34280fd5628b68dac74402b..2a176761ed4705e9009af85892cdb238b1606975 100644 (file)
--- 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 42b3131f658e9a72224bb76613dcf8c1f38a5bff..6ae5cfbf9d948666757ed716dcf3350f993ba9f7 100644 (file)
--- 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 f382b1bd14c1265c3387677bad2e5b8c85373301..fbbf44add42cdf026a465bc50aeb743493c43c0c 100644 (file)
--- 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 53ba72bbd271ac348abdbf555787d3ed3e722099..b5956d24fc25b2821e9cf97655e1df30d5b912c9 100644 (file)
--- 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 81073465bf07712df95e2432a662c3034185f4bb..d8588759d1a860c78261c2e83f28192ac40d77d3 100644 (file)
--- 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 7de173f5f3bf3b956f2d1919c31b5ee99f8b9ddf..2897de49051e5889511e443651b82fd765b6e066 100644 (file)
--- 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 8a77f919c5d7d47352bcc008bb745eb524f4a38e..7853b364956c4f71901fb6772f14c18465d3b16e 100644 (file)
--- 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 e89d982a7860934716a91be1dddd51494d4dd7d3..a0916a0a24515000adf81b2d3e6940ca5dc5eb22 100644 (file)
--- 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 34f349762171ab6a53e4f009203632103f242b60..90737fb8a859c672795ad64d8820481b774c3644 100644 (file)
--- 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 47ebbea54e4f518f31d30e262b78c0a5cd3ba8cd..3df178bfa1f5f88a3f8c516d2c6c9713278677ac 100644 (file)
--- 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',