mirror of
https://github.com/systemd/systemd
synced 2024-10-15 04:24:19 +00:00
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.
This commit is contained in:
parent
45c0ecba2d
commit
1e09470303
|
@ -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"
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -12,7 +12,6 @@ sources = files(
|
|||
'journald-stream.c',
|
||||
'journald-syslog.c',
|
||||
'journald-wall.c',
|
||||
'managed-journal-file.c',
|
||||
)
|
||||
|
||||
sources += custom_target(
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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"
|
||||
|
||||
|
|
|
@ -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"
|
|
@ -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',
|
||||
|
|
Loading…
Reference in a new issue