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

libsystemd: Clean up includes

Browse Source 
For libsystemd's headers, the changes made depend on whether the
header is installed or not. For installed headers, the only change
made is that commonly included headers were moved to _sd-common.h.
For these headers, there should be no noticeable change in behavior
when including them. For non-installed headers, includes were replaced
with forward declarations where possible as usual.

Split out of #37344.
This commit is contained in:
Daan De Meyer
2025-05-25 03:40:24 +09:00
committed by Yu Watanabe
parent b416ac0e15
commit 5cdf13c70c
272 changed files with 569 additions and 987 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libsystemd/sd-bus/bus-common-errors.c
-2
View File
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include "sd-bus.h"
#include "bus-common-errors.h"
src/libsystemd/sd-bus/bus-container.c
+1
View File
@@ -7,6 +7,7 @@
#include "bus-internal.h"
#include "bus-socket.h"
#include "fd-util.h"
#include "format-util.h"
#include "log.h"
#include "namespace-util.h"
#include "process-util.h"
src/libsystemd/sd-bus/bus-container.h
+1 -1
View File
@@ -1,6 +1,6 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include "sd-bus.h"
#include "forward.h"
int bus_container_connect_socket(sd_bus *b);
src/libsystemd/sd-bus/bus-control.c
+1 -9
View File
@@ -1,23 +1,15 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#if HAVE_VALGRIND_MEMCHECK_H
#include <valgrind/memcheck.h>
#endif
#include <errno.h>
#include <stddef.h>
#include "sd-bus.h"
#include "alloc-util.h"
#include "bus-control.h"
#include "bus-internal.h"
#include "bus-message.h"
#include "capability-util.h"
#include "fd-util.h"
#include "log.h"
#include "pidref.h"
#include "process-util.h"
#include "stdio-util.h"
#include "string-util.h"
#include "strv.h"
#include "user-util.h"
src/libsystemd/sd-bus/bus-control.h
+1 -1
View File
@@ -1,7 +1,7 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include "sd-bus.h"
#include "forward.h"
int bus_add_match_internal(sd_bus *bus, const char *match, uint64_t timeout_usec, uint64_t *ret_counter);
int bus_add_match_internal_async(sd_bus *bus, sd_bus_slot **ret, const char *match, sd_bus_message_handler_t callback, void *userdata, uint64_t timeout_usec);
src/libsystemd/sd-bus/bus-convenience.c
+2 -3
View File
@@ -1,14 +1,13 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <sys/types.h>
#include <unistd.h>
#include "alloc-util.h"
#include "sd-bus.h"
#include "bus-internal.h"
#include "bus-message.h"
#include "bus-signature.h"
#include "bus-type.h"
#include "log.h"
#include "string-util.h"
_public_ int sd_bus_message_send(sd_bus_message *reply) {
src/libsystemd/sd-bus/bus-creds.c
+3 -1
View File
@@ -1,7 +1,8 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <linux/capability.h>
#include <stdlib.h>
#include "sd-bus.h"
#include "alloc-util.h"
#include "audit-util.h"
@@ -17,6 +18,7 @@
#include "hexdecoct.h"
#include "nulstr-util.h"
#include "parse-util.h"
#include "pidref.h"
#include "process-util.h"
#include "string-util.h"
#include "strv.h"
src/libsystemd/sd-bus/bus-creds.h
+3 -8
View File
@@ -1,14 +1,9 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdbool.h>
#include "forward.h"
#include "sd-bus.h"
#include "pidref.h"
#include "user-util.h"
struct sd_bus_creds {
typedef struct sd_bus_creds {
bool allocated;
unsigned n_ref;
@@ -65,7 +60,7 @@ struct sd_bus_creds {
char *cgroup_root;
char *description, *unescaped_description;
};
} sd_bus_creds;
#define SD_BUS_CREDS_INIT_FIELDS \
.uid = UID_INVALID, \
src/libsystemd/sd-bus/bus-dump-json.c
+1 -2
View File
@@ -6,8 +6,7 @@
#include "bus-internal.h"
#include "bus-message.h"
#include "json-util.h"
#include "macro.h"
#include "memory-util.h"
#include "string-util.h"
#include "time-util.h"
static int json_transform_one(sd_bus_message *m, sd_json_variant **ret);
src/libsystemd/sd-bus/bus-dump.c
+2 -3
View File
@@ -1,6 +1,6 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <sys/time.h>
#include "sd-bus.h"
#include "alloc-util.h"
#include "ansi-color.h"
@@ -14,11 +14,10 @@
#include "format-util.h"
#include "glyph-util.h"
#include "log.h"
#include "macro.h"
#include "pcapng.h"
#include "string-util.h"
#include "strv.h"
#include "terminal-util.h"
#include "time-util.h"
static char* indent(unsigned level, uint64_t flags) {
if (FLAGS_SET(flags, SD_BUS_MESSAGE_DUMP_SUBTREE_ONLY) && level > 0)
src/libsystemd/sd-bus/bus-dump.h
+1 -4
View File
@@ -1,10 +1,7 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdbool.h>
#include <stdio.h>
#include "sd-bus.h"
#include "forward.h"
int bus_creds_dump(sd_bus_creds *c, FILE *f, bool terse);
src/libsystemd/sd-bus/bus-error.c
+1 -9
View File
@@ -1,20 +1,12 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <stdarg.h>
#include <stdbool.h>
#include <stdio.h>
#include <stdlib.h>
#include "sd-bus.h"
#include "alloc-util.h"
#include "bus-error.h"
#include "errno-list.h"
#include "errno-util.h"
#include "log.h"
#include "string-util.h"
#include "strv.h"
BUS_ERROR_MAP_ELF_REGISTER const sd_bus_error_map bus_standard_errors[] = {
SD_BUS_ERROR_MAP(SD_BUS_ERROR_FAILED, EACCES),
@@ -592,7 +584,7 @@ const char* _bus_error_message(const sd_bus_error *e, int error, char buf[static
if (e && e->message)
return e->message;
return strerror_r(abs(error), buf, ERRNO_BUF_LEN);
return strerror_r(ABS(error), buf, ERRNO_BUF_LEN);
}
static bool map_ok(const sd_bus_error_map *map) {
src/libsystemd/sd-bus/bus-error.h
+2 -4
View File
@@ -1,12 +1,10 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdbool.h>
#include "sd-bus.h"
#include "sd-bus-protocol.h"
#include "errno-util.h"
#include "macro.h"
#include "forward.h"
bool bus_error_is_dirty(sd_bus_error *e);
src/libsystemd/sd-bus/bus-internal.c
+3
View File
@@ -1,6 +1,9 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "sd-bus.h"
#include "alloc-util.h"
#include "bus-error.h"
#include "bus-internal.h"
#include "bus-message.h"
#include "escape.h"
src/libsystemd/sd-bus/bus-internal.h
+6 -11
View File
@@ -1,20 +1,15 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <pthread.h>
#include "sd-id128.h"
#include "sd-bus.h"
#include "bus-error.h"
#include "bus-kernel.h"
#include "bus-match.h"
#include "constants.h"
#include "hashmap.h"
#include "forward.h"
#include "list.h"
#include "prioq.h"
#include "runtime-scope.h"
#include "socket-util.h"
#include "time-util.h"
/* Note that we use the new /run prefix here (instead of /var/run) since we require them to be aliases and
* that way we become independent of /var being mounted */
@@ -126,7 +121,7 @@ typedef enum BusSlotType {
_BUS_SLOT_INVALID = -EINVAL,
} BusSlotType;
struct sd_bus_slot {
typedef struct sd_bus_slot {
unsigned n_ref;
BusSlotType type:8;
@@ -157,7 +152,7 @@ struct sd_bus_slot {
struct node_object_manager node_object_manager;
struct node_vtable node_vtable;
};
};
} sd_bus_slot;
enum bus_state {
BUS_UNSET,
@@ -181,7 +176,7 @@ enum bus_auth {
BUS_AUTH_ANONYMOUS
};
struct sd_bus {
typedef struct sd_bus {
unsigned n_ref;
enum bus_state state;
@@ -327,7 +322,7 @@ struct sd_bus {
/* zero means use value specified by $SYSTEMD_BUS_TIMEOUT= environment variable or built-in default */
usec_t method_call_timeout;
};
} sd_bus;
/* For method calls we timeout at 25s, like in the D-Bus reference implementation */
#define BUS_DEFAULT_TIMEOUT ((usec_t) (25 * USEC_PER_SEC))
src/libsystemd/sd-bus/bus-introspect.c
+5 -5
View File
@@ -1,15 +1,15 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <stdio.h>
#include "sd-bus-vtable.h"
#include "bus-internal.h"
#include "bus-introspect.h"
#include "bus-objects.h"
#include "bus-protocol.h"
#include "bus-signature.h"
#include "fd-util.h"
#include "fileio.h"
#include "log.h"
#include "memory-util.h"
#include "memstream-util.h"
#include "ordered-set.h"
#include "string-util.h"
#define BUS_INTROSPECT_DOCTYPE \
src/libsystemd/sd-bus/bus-introspect.h
+1 -5
View File
@@ -1,12 +1,8 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdio.h>
#include "sd-bus.h"
#include "forward.h"
#include "memstream-util.h"
#include "ordered-set.h"
struct introspect {
MemStream m;
src/libsystemd/sd-bus/bus-kernel.c
+1 -21
View File
@@ -1,31 +1,11 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#if HAVE_VALGRIND_MEMCHECK_H
#include <valgrind/memcheck.h>
#endif
#include <fcntl.h>
#include <malloc.h>
#include <sys/mman.h>
#include <sys/prctl.h>
#include "alloc-util.h"
#include "bus-internal.h"
#include "bus-kernel.h"
#include "bus-label.h"
#include "bus-message.h"
#include "capability-util.h"
#include "bus-internal.h"
#include "fd-util.h"
#include "fileio.h"
#include "format-util.h"
#include "log.h"
#include "memfd-util.h"
#include "memory-util.h"
#include "parse-util.h"
#include "stdio-util.h"
#include "string-util.h"
#include "strv.h"
#include "user-util.h"
void close_and_munmap(int fd, void *address, size_t size) {
if (size > 0) {
src/libsystemd/sd-bus/bus-kernel.h
+1 -1
View File
@@ -1,7 +1,7 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include "sd-bus.h"
#include "forward.h"
#define MEMFD_CACHE_MAX 32
src/libsystemd/sd-bus/bus-match.c
+4 -3
View File
@@ -1,15 +1,16 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "sd-bus.h"
#include "alloc-util.h"
#include "bus-internal.h"
#include "bus-match.h"
#include "bus-message.h"
#include "fd-util.h"
#include "fileio.h"
#include "hashmap.h"
#include "hexdecoct.h"
#include "log.h"
#include "memstream-util.h"
#include "sort-util.h"
#include "stdio-util.h"
#include "string-util.h"
#include "strv.h"
src/libsystemd/sd-bus/bus-match.h
+1 -5
View File
@@ -1,11 +1,7 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdio.h>
#include "sd-bus.h"
#include "hashmap.h"
#include "forward.h"
enum bus_match_node_type {
BUS_MATCH_ROOT,
src/libsystemd/sd-bus/bus-message.c
-3
View File
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <fcntl.h>
#include <sys/mman.h>
#include "sd-bus.h"
@@ -18,7 +16,6 @@
#include "memory-util.h"
#include "string-util.h"
#include "strv.h"
#include "time-util.h"
#include "utf8.h"
static int message_append_basic(sd_bus_message *m, char type, const void *p, const void **stored);
src/libsystemd/sd-bus/bus-message.h
+6 -7
View File
@@ -2,15 +2,14 @@
#pragma once
#include <byteswap.h>
#include <stdbool.h>
#include <sys/socket.h>
#include <sys/uio.h>
#include "sd-bus.h"
#include "sd-bus-protocol.h"
#include "bus-creds.h"
#include "bus-protocol.h"
#include "macro.h"
#include "time-util.h"
#include "forward.h"
#include "memory-util.h"
struct bus_container {
char enclosing;
@@ -42,7 +41,7 @@ struct bus_body_part {
bool is_zero:1;
};
struct sd_bus_message {
typedef struct sd_bus_message {
/* Caveat: a message can be referenced in two different ways: the main (user-facing) way will also
* pin the bus connection object the message is associated with. The secondary way ("queued") is used
* when a message is in the read or write queues of the bus connection object, which will not pin the
@@ -119,7 +118,7 @@ struct sd_bus_message {
unsigned n_header_offsets;
uint64_t read_counter;
};
} sd_bus_message;
static inline bool BUS_MESSAGE_NEED_BSWAP(sd_bus_message *m) {
return m->header->endian != BUS_NATIVE_ENDIAN;
src/libsystemd/sd-bus/bus-objects.c
+3 -1
View File
@@ -2,6 +2,8 @@
#include <linux/capability.h>
#include "sd-bus.h"
#include "alloc-util.h"
#include "bus-internal.h"
#include "bus-introspect.h"
@@ -10,7 +12,7 @@
#include "bus-signature.h"
#include "bus-slot.h"
#include "bus-type.h"
#include "log.h"
#include "ordered-set.h"
#include "set.h"
#include "string-util.h"
#include "strv.h"
src/libsystemd/sd-bus/bus-objects.h
+3 -2
View File
@@ -1,8 +1,9 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include "bus-internal.h"
#include "bus-introspect.h"
#include "forward.h"
struct node;
const sd_bus_vtable* bus_vtable_next(const sd_bus_vtable *vtable, const sd_bus_vtable *v);
bool bus_vtable_has_names(const sd_bus_vtable *vtable);
src/libsystemd/sd-bus/bus-protocol.h
+1 -1
View File
@@ -3,7 +3,7 @@
#include <endian.h>
#include "macro.h"
#include "forward.h"
/* Packet header */
src/libsystemd/sd-bus/bus-signature.c
+1 -2
View File
@@ -1,8 +1,7 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "sd-bus.h"
#include "sd-bus-protocol.h"
#include "assert-util.h"
#include "bus-signature.h"
#include "bus-type.h"
src/libsystemd/sd-bus/bus-signature.h
+1 -2
View File
@@ -1,8 +1,7 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdbool.h>
#include <stddef.h>
#include "forward.h"
bool signature_is_single(const char *s, bool allow_dict_entry);
bool signature_is_pair(const char *s);
src/libsystemd/sd-bus/bus-slot.c
+1 -1
View File
@@ -6,7 +6,7 @@
#include "bus-control.h"
#include "bus-objects.h"
#include "bus-slot.h"
#include "log.h"
#include "prioq.h"
#include "set.h"
#include "string-util.h"
src/libsystemd/sd-bus/bus-slot.h
+1 -2
View File
@@ -1,9 +1,8 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include "sd-bus.h"
#include "bus-internal.h"
#include "forward.h"
sd_bus_slot *bus_slot_allocate(sd_bus *bus, bool floating, BusSlotType type, size_t extra, void *userdata);
src/libsystemd/sd-bus/bus-socket.c
+4 -3
View File
@@ -1,8 +1,10 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <endian.h>
#include <grp.h>
#include <poll.h>
#include <stdlib.h>
#include <sys/inotify.h>
#include <unistd.h>
#include "sd-bus.h"
@@ -12,22 +14,21 @@
#include "bus-internal.h"
#include "bus-message.h"
#include "bus-socket.h"
#include "errno-util.h"
#include "escape.h"
#include "fd-util.h"
#include "format-util.h"
#include "fs-util.h"
#include "hexdecoct.h"
#include "io-util.h"
#include "iovec-util.h"
#include "log.h"
#include "macro.h"
#include "memory-util.h"
#include "path-util.h"
#include "process-util.h"
#include "random-util.h"
#include "signal-util.h"
#include "stdio-util.h"
#include "string-util.h"
#include "time-util.h"
#include "user-util.h"
#include "utf8.h"
src/libsystemd/sd-bus/bus-socket.h
+1 -3
View File
@@ -1,9 +1,7 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdbool.h>
#include "sd-bus.h"
#include "forward.h"
void bus_socket_setup(sd_bus *b);
src/libsystemd/sd-bus/bus-track.c
+1
View File
@@ -5,6 +5,7 @@
#include "alloc-util.h"
#include "bus-internal.h"
#include "bus-track.h"
#include "hashmap.h"
#include "log.h"
#include "string-util.h"
src/libsystemd/sd-bus/bus-track.h
+1 -1
View File
@@ -1,7 +1,7 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
typedef struct sd_bus_track sd_bus_track;
#include "forward.h"
void bus_track_dispatch(sd_bus_track *track);
void bus_track_close(sd_bus_track *track);
src/libsystemd/sd-bus/bus-type.c
-3
View File
@@ -1,12 +1,9 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include "sd-bus.h"
#include "bus-internal.h"
#include "bus-type.h"
#include "log.h"
bool bus_type_is_valid(char c) {
static const char valid[] = {
src/libsystemd/sd-bus/bus-type.h
+1 -3
View File
@@ -1,9 +1,7 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdbool.h>
#include "macro.h"
#include "forward.h"
bool bus_type_is_valid(char c) _const_;
bool bus_type_is_basic(char c) _const_;
src/libsystemd/sd-bus/fuzz-bus-match.c
+2 -2
View File
@@ -1,11 +1,11 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "sd-bus.h"
#include "alloc-util.h"
#include "bus-internal.h"
#include "bus-match.h"
#include "env-util.h"
#include "fd-util.h"
#include "fileio.h"
#include "fuzz.h"
#include "memstream-util.h"
src/libsystemd/sd-bus/fuzz-bus-message.c
+2 -3
View File
@@ -1,11 +1,10 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "sd-bus.h"
#include "alloc-util.h"
#include "bus-dump.h"
#include "bus-message.h"
#include "env-util.h"
#include "fd-util.h"
#include "fileio.h"
#include "fuzz.h"
#include "memstream-util.h"
src/libsystemd/sd-bus/sd-bus.c
+6 -8
View File
@@ -1,22 +1,21 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <endian.h>
#include <netdb.h>
#include <poll.h>
#include <pthread.h>
#include <signal.h>
#include <stdlib.h>
#include <sys/mman.h>
#include <sys/stat.h>
#include <sys/wait.h>
#include <threads.h>
#include <unistd.h>
#include "sd-bus.h"
#include "sd-event.h"
#include "af-list.h"
#include "alloc-util.h"
#include "bus-container.h"
#include "bus-control.h"
#include "bus-error.h"
#include "bus-internal.h"
#include "bus-kernel.h"
#include "bus-label.h"
@@ -28,7 +27,6 @@
#include "bus-track.h"
#include "bus-type.h"
#include "cgroup-util.h"
#include "constants.h"
#include "errno-util.h"
#include "fd-util.h"
#include "format-util.h"
@@ -38,16 +36,16 @@
#include "io-util.h"
#include "log.h"
#include "log-context.h"
#include "macro.h"
#include "memory-util.h"
#include "missing_syscall.h"
#include "origin-id.h"
#include "parse-util.h"
#include "path-util.h"
#include "prioq.h"
#include "process-util.h"
#include "stdio-util.h"
#include "set.h"
#include "string-util.h"
#include "strv.h"
#include "time-util.h"
#include "user-util.h"
#define log_debug_bus_message(m) \
src/libsystemd/sd-bus/test-bus-benchmark.c
+3 -3
View File
@@ -1,5 +1,8 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <pthread.h>
#include <sched.h>
#include <stdlib.h>
#include <sys/resource.h>
#include <sys/wait.h>
#include <unistd.h>
@@ -8,10 +11,7 @@
#include "alloc-util.h"
#include "bus-internal.h"
#include "bus-kernel.h"
#include "constants.h"
#include "fd-util.h"
#include "string-util.h"
#include "tests.h"
#include "time-util.h"
src/libsystemd/sd-bus/test-bus-chat.c
+1 -2
View File
@@ -2,7 +2,6 @@
#include <fcntl.h>
#include <pthread.h>
#include <stdlib.h>
#include <unistd.h>
#include "sd-bus.h"
@@ -15,9 +14,9 @@
#include "fd-util.h"
#include "format-util.h"
#include "log.h"
#include "macro.h"
#include "string-util.h"
#include "tests.h"
#include "time-util.h"
static int match_callback(sd_bus_message *m, void *userdata, sd_bus_error *ret_error) {
log_info("Match triggered! destination=%s interface=%s member=%s",
src/libsystemd/sd-bus/test-bus-cleanup.c
-1
View File
@@ -1,6 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <stdio.h>
#include <unistd.h>
#include "sd-bus.h"
src/libsystemd/sd-bus/test-bus-marshal.c
-4
View File
@@ -1,7 +1,6 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <math.h>
#include <stdlib.h>
/* We make an exception here to our usual "include system headers first" rule because we need one of these
* macros to disable a warning triggered by the glib headers. */
@@ -20,13 +19,10 @@ REENABLE_WARNING
#include "sd-bus.h"
#include "alloc-util.h"
#include "bus-dump.h"
#include "bus-label.h"
#include "bus-message.h"
#include "bus-util.h"
#include "escape.h"
#include "fd-util.h"
#include "fileio.h"
#include "log.h"
#include "memstream-util.h"
#include "tests.h"
src/libsystemd/sd-bus/test-bus-match.c
+3 -2
View File
@@ -1,10 +1,11 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "sd-bus.h"
#include "bus-internal.h"
#include "bus-match.h"
#include "bus-message.h"
#include "bus-slot.h"
#include "log.h"
#include "macro.h"
#include "memory-util.h"
#include "tests.h"
src/libsystemd/sd-bus/test-bus-objects.c
-3
View File
@@ -1,16 +1,13 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <pthread.h>
#include <stdlib.h>
#include "sd-bus.h"
#include "alloc-util.h"
#include "bus-dump.h"
#include "bus-internal.h"
#include "bus-message.h"
#include "log.h"
#include "macro.h"
#include "strv.h"
#include "tests.h"
src/libsystemd/sd-bus/test-bus-peersockaddr.c
+1 -2
View File
@@ -6,11 +6,10 @@
#include "sd-bus.h"
#include "bus-dump.h"
#include "bus-util.h"
#include "fd-util.h"
#include "pidref.h"
#include "process-util.h"
#include "socket-util.h"
#include "sort-util.h"
#include "tests.h"
#include "user-util.h"
src/libsystemd/sd-bus/test-bus-queue-ref-cycle.c
+1
View File
@@ -1,4 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "sd-bus.h"
#include "main-func.h"
src/libsystemd/sd-bus/test-bus-server.c
+2 -3
View File
@@ -1,13 +1,12 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <pthread.h>
#include <stdlib.h>
#include <sys/socket.h>
#include "sd-bus.h"
#include "bus-internal.h"
#include "bus-error.h"
#include "log.h"
#include "macro.h"
#include "memory-util.h"
#include "string-util.h"
#include "tests.h"
src/libsystemd/sd-bus/test-bus-signature.c
-1
View File
@@ -3,7 +3,6 @@
#include "bus-internal.h"
#include "bus-signature.h"
#include "log.h"
#include "string-util.h"
#include "tests.h"
int main(int argc, char *argv[]) {
src/libsystemd/sd-bus/test-bus-track.c
+1 -2
View File
@@ -1,11 +1,10 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <sys/socket.h>
#include "sd-bus.h"
#include "sd-event.h"
#include "macro.h"
#include "tests.h"
static bool track_cb_called_x = false;
src/libsystemd/sd-bus/test-bus-vtable.c
+1 -4
View File
@@ -1,18 +1,15 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <stdbool.h>
#include <stddef.h>
/* We use system assert.h here, because we don't want to keep macro.h and log.h C++ compatible */
#undef NDEBUG
#include <assert.h>
#include <errno.h>
#include <stdio.h>
#include "sd-bus.h"
#include "sd-bus-vtable.h"
#ifndef __cplusplus
# include "alloc-util.h"
# include "bus-objects.h"
# include "log.h"
#endif
src/libsystemd/sd-bus/test-bus-watch-bind.c
+1
View File
@@ -17,6 +17,7 @@
#include "socket-util.h"
#include "string-util.h"
#include "tests.h"
#include "time-util.h"
#include "tmpfile-util.h"
static int method_foobar(sd_bus_message *m, void *userdata, sd_bus_error *ret_error) {
src/libsystemd/sd-daemon/sd-daemon.c
+1 -5
View File
@@ -1,14 +1,9 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <limits.h>
#include <mqueue.h>
#include <netinet/in.h>
#include <poll.h>
#include <stdarg.h>
#include <stddef.h>
#include <stdio.h>
#include <stdlib.h>
#include <sys/stat.h>
#include <sys/un.h>
#include <unistd.h>
@@ -16,6 +11,7 @@
#include "sd-daemon.h"
#include "alloc-util.h"
#include "errno-util.h"
#include "extract-word.h"
#include "fd-util.h"
#include "fs-util.h"
src/libsystemd/sd-device/device-enumerator-private.h
+1 -3
View File
@@ -1,9 +1,7 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdbool.h>
#include "sd-device.h"
#include "forward.h"
typedef enum MatchInitializedType {
MATCH_INITIALIZED_NO, /* only devices without a db entry */
src/libsystemd/sd-device/device-enumerator.c
+2 -2
View File
@@ -1,8 +1,6 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <fcntl.h>
#include <fnmatch.h>
#include <unistd.h>
#include "sd-device.h"
@@ -12,6 +10,8 @@
#include "device-util.h"
#include "dirent-util.h"
#include "fd-util.h"
#include "log.h"
#include "path-util.h"
#include "set.h"
#include "sort-util.h"
#include "string-util.h"
src/libsystemd/sd-device/device-filter.c
+3 -1
View File
@@ -1,10 +1,12 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <fnmatch.h>
#include "sd-device.h"
#include "alloc-util.h"
#include "device-filter.h"
#include "hashmap.h"
#include "path-util.h"
#include "set.h"
#include "strv.h"
int update_match_strv(Hashmap **match_strv, const char *key, const char *value, bool clear_on_null) {
src/libsystemd/sd-device/device-filter.h
+1 -6
View File
@@ -1,12 +1,7 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdbool.h>
#include "sd-device.h"
#include "hashmap.h"
#include "set.h"
#include "forward.h"
int update_match_strv(Hashmap **match_strv, const char *key, const char *value, bool clear_on_null);
bool device_match_sysattr(sd_device *device, Hashmap *match_sysattr, Hashmap *nomatch_sysattr);
src/libsystemd/sd-device/device-internal.h
+2 -4
View File
@@ -3,10 +3,8 @@
#include "sd-device.h"
#include "device-private.h"
#include "hashmap.h"
#include "set.h"
#include "time-util.h"
#include "forward.h"
#include "iterator.h"
#define LATEST_UDEV_DATABASE_VERSION 1
src/libsystemd/sd-device/device-monitor-private.h
+1 -5
View File
@@ -1,11 +1,7 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <errno.h>
#include "sd-device.h"
#include "socket-util.h"
#include "forward.h"
typedef enum MonitorNetlinkGroup {
MONITOR_GROUP_NONE,
src/libsystemd/sd-device/device-monitor.c
+2 -3
View File
@@ -1,6 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <linux/filter.h>
#include <linux/netlink.h>
#include <linux/sockios.h>
@@ -22,13 +21,13 @@
#include "hashmap.h"
#include "io-util.h"
#include "iovec-util.h"
#include "log.h"
#include "log-context.h"
#include "missing_socket.h"
#include "mountpoint-util.h"
#include "set.h"
#include "socket-util.h"
#include "stat-util.h"
#include "string-util.h"
#include "strv.h"
#include "uid-range.h"
#define log_monitor(m, format, ...) \
src/libsystemd/sd-device/device-private.c
+5 -5
View File
@@ -1,8 +1,8 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <ctype.h>
#include <net/if.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/sysmacros.h>
#include <unistd.h>
#include "sd-device.h"
@@ -10,21 +10,21 @@
#include "device-internal.h"
#include "device-private.h"
#include "device-util.h"
#include "extract-word.h"
#include "fd-util.h"
#include "fileio.h"
#include "fs-util.h"
#include "hashmap.h"
#include "macro.h"
#include "mkdir.h"
#include "nulstr-util.h"
#include "parse-util.h"
#include "path-util.h"
#include "set.h"
#include "stdio-util.h"
#include "string-table.h"
#include "string-util.h"
#include "strv.h"
#include "strxcpyx.h"
#include "time-util.h"
#include "tmpfile-util.h"
#include "user-util.h"
src/libsystemd/sd-device/device-private.h
+3 -8
View File
@@ -1,16 +1,11 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <dirent.h>
#include <inttypes.h>
#include <stdbool.h>
#include <sys/stat.h>
#include <sys/types.h>
#include "sd-device.h" /* IWYU pragma: export */
#include "sd-device.h"
#include "forward.h"
#include "chase.h"
#include "macro.h"
typedef enum ChaseFlags ChaseFlags;
int device_new_from_mode_and_devnum(sd_device **ret, mode_t mode, dev_t devnum);
int device_new_from_nulstr(sd_device **ret, char *nulstr, size_t len);
src/libsystemd/sd-device/device-util.c
+5 -1
View File
@@ -1,6 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "alloc-util.h"
#include "device-private.h"
#include "device-util.h"
#include "devnum-util.h"
@@ -29,6 +28,11 @@ int devname_from_devnum(mode_t mode, dev_t devnum, char **ret) {
return strdup_to(ret, devname);
}
int devname_from_stat_rdev(const struct stat *st, char **ret) {
assert(st);
return devname_from_devnum(st->st_mode, st->st_rdev, ret);
}
int device_open_from_devnum(mode_t mode, dev_t devnum, int flags, char **ret_devname) {
_cleanup_(sd_device_unrefp) sd_device *dev = NULL;
_cleanup_close_ int fd = -EBADF;
src/libsystemd/sd-device/device-util.h
+2 -10
View File
@@ -1,15 +1,10 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdbool.h>
#include <sys/stat.h>
#include <sys/types.h>
#include "sd-device.h"
#include "alloc-util.h"
#include "forward.h"
#include "log.h"
#include "macro.h"
#define device_unref_and_replace(a, b) \
unref_and_replace_full(a, b, sd_device_ref, sd_device_unref)
@@ -95,10 +90,7 @@
#define log_device_error_errno(device, error, ...) log_device_full_errno(device, LOG_ERR, error, __VA_ARGS__)
int devname_from_devnum(mode_t mode, dev_t devnum, char **ret);
static inline int devname_from_stat_rdev(const struct stat *st, char **ret) {
assert(st);
return devname_from_devnum(st->st_mode, st->st_rdev, ret);
}
int devname_from_stat_rdev(const struct stat *st, char **ret);
int device_open_from_devnum(mode_t mode, dev_t devnum, int flags, char **ret_devname);
char** device_make_log_fields(sd_device *device);
src/libsystemd/sd-device/sd-device.c
+6 -9
View File
@@ -1,11 +1,9 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <ctype.h>
#include <net/if.h>
#include <sys/ioctl.h>
#include <sys/types.h>
#include <unistd.h>
#include "sd-device.h"
#include "sd-id128.h"
#include "alloc-util.h"
#include "chase.h"
@@ -15,24 +13,23 @@
#include "devnum-util.h"
#include "dirent-util.h"
#include "env-util.h"
#include "errno-util.h"
#include "extract-word.h"
#include "fd-util.h"
#include "fileio.h"
#include "format-util.h"
#include "fs-util.h"
#include "hashmap.h"
#include "id128-util.h"
#include "macro.h"
#include "missing_magic.h"
#include "netlink-util.h"
#include "parse-util.h"
#include "path-util.h"
#include "set.h"
#include "socket-util.h"
#include "stat-util.h"
#include "stdio-util.h"
#include "string-util.h"
#include "strv.h"
#include "strxcpyx.h"
#include "user-util.h"
#include "time-util.h"
int device_new_aux(sd_device **ret) {
sd_device *device;
src/libsystemd/sd-device/test-device-util.c
+2
View File
@@ -1,5 +1,7 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "sd-device.h"
#include "device-util.h"
#include "mountpoint-util.h"
#include "tests.h"
src/libsystemd/sd-device/test-sd-device-monitor.c
+2 -3
View File
@@ -1,6 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <stdbool.h>
#include <unistd.h>
#include "sd-device.h"
@@ -10,13 +9,13 @@
#include "device-private.h"
#include "device-util.h"
#include "io-util.h"
#include "macro.h"
#include "mountpoint-util.h"
#include "path-util.h"
#include "socket-util.h"
#include "stat-util.h"
#include "string-util.h"
#include "tests.h"
#include "virt.h"
#include "time-util.h"
static void prepare_loopback(sd_device **ret) {
_cleanup_(sd_device_unrefp) sd_device *dev = NULL;
src/libsystemd/sd-device/test-sd-device-thread.c
+1 -4
View File
@@ -1,9 +1,6 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <pthread.h>
#include <stdio.h>
#include <stdlib.h>
#include "sd-device.h"
@@ -12,7 +9,7 @@
#define handle_error_errno(error, msg) \
({ \
errno = abs(error); \
errno = ABS(error); \
perror(msg); \
EXIT_FAILURE; \
})
src/libsystemd/sd-device/test-sd-device.c
+3 -3
View File
@@ -1,10 +1,10 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <ctype.h>
#include <fcntl.h>
#include <unistd.h>
#include "device-enumerator-private.h"
#include "sd-event.h"
#include "device-internal.h"
#include "device-private.h"
#include "device-util.h"
@@ -15,10 +15,10 @@
#include "nulstr-util.h"
#include "path-util.h"
#include "rm-rf.h"
#include "set.h"
#include "stat-util.h"
#include "string-util.h"
#include "tests.h"
#include "time-util.h"
#include "tmpfile-util.h"
#include "udev-util.h"
src/libsystemd/sd-event/event-source.h
+4 -6
View File
@@ -1,16 +1,14 @@
#pragma once
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <sys/epoll.h>
#include <sys/timerfd.h>
#include <sys/wait.h>
#include <signal.h>
#include <sys/signalfd.h>
#include "sd-event.h"
#include "hashmap.h"
#include "forward.h"
#include "inotify-util.h"
#include "list.h"
#include "prioq.h"
#include "ratelimit.h"
typedef enum EventSourceType {
src/libsystemd/sd-event/event-util.c
+5 -2
View File
@@ -1,13 +1,16 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include "sd-event.h"
#include "errno-util.h"
#include "alloc-util.h"
#include "event-source.h"
#include "event-util.h"
#include "fd-util.h"
#include "hash-funcs.h"
#include "log.h"
#include "pidref.h"
#include "string-util.h"
#include "time-util.h"
#define SI_FLAG_FORWARD (INT32_C(1) << 30)
#define SI_FLAG_POSITIVE (INT32_C(1) << 29)
src/libsystemd/sd-event/event-util.h
+1 -4
View File
@@ -1,12 +1,9 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdbool.h>
#include "sd-event.h"
#include "hash-funcs.h"
#include "pidref.h"
#include "forward.h"
extern const struct hash_ops event_source_hash_ops;
src/libsystemd/sd-event/sd-event.c
+5 -5
View File
@@ -1,6 +1,6 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <sys/epoll.h>
#include <stdlib.h>
#include <sys/timerfd.h>
#include <sys/wait.h>
#include <threads.h>
@@ -11,20 +11,19 @@
#include "sd-messages.h"
#include "alloc-util.h"
#include "env-util.h"
#include "errno-util.h"
#include "event-source.h"
#include "fd-util.h"
#include "fs-util.h"
#include "format-util.h"
#include "glyph-util.h"
#include "hashmap.h"
#include "hexdecoct.h"
#include "list.h"
#include "log.h"
#include "logarithm.h"
#include "macro.h"
#include "mallinfo-util.h"
#include "memory-util.h"
#include "missing_magic.h"
#include "missing_syscall.h"
#include "missing_wait.h"
#include "origin-id.h"
#include "path-util.h"
@@ -34,6 +33,7 @@
#include "psi-util.h"
#include "set.h"
#include "signal-util.h"
#include "siphash24.h"
#include "socket-util.h"
#include "stat-util.h"
#include "string-table.h"
src/libsystemd/sd-event/test-event.c
+2 -6
View File
@@ -1,22 +1,17 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#if HAVE_PIDFD_OPEN
#include <sys/pidfd.h>
#endif
#include <sys/wait.h>
#include <unistd.h>
#include "sd-event.h"
#include "alloc-util.h"
#include "exec-util.h"
#include "fd-util.h"
#include "fs-util.h"
#include "log.h"
#include "macro.h"
#include "missing_syscall.h"
#include "parse-util.h"
#include "path-util.h"
#include "pidfd-util.h"
#include "process-util.h"
#include "random-util.h"
#include "rm-rf.h"
@@ -24,6 +19,7 @@
#include "stdio-util.h"
#include "string-util.h"
#include "tests.h"
#include "time-util.h"
#include "tmpfile-util.h"
static int prepare_handler(sd_event_source *s, void *userdata) {
src/libsystemd/sd-hwdb/hwdb-internal.h
+2 -3
View File
@@ -1,11 +1,10 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdint.h>
#include <sys/stat.h>
#include "constants.h"
#include "hashmap.h"
#include "forward.h"
#include "iterator.h"
#include "sparse-endian.h"
#define HWDB_SIG { 'K', 'S', 'L', 'P', 'H', 'H', 'R', 'H' }
src/libsystemd/sd-hwdb/sd-hwdb.c
-3
View File
@@ -3,9 +3,7 @@
Copyright © 2008 Alan Jenkins <alan.christopher.jenkins@googlemail.com>
***/
#include <errno.h>
#include <fnmatch.h>
#include <inttypes.h>
#include <stdio.h>
#include <stdlib.h>
#include <sys/mman.h>
@@ -21,7 +19,6 @@
#include "log.h"
#include "nulstr-util.h"
#include "string-util.h"
#include "time-util.h"
struct linebuf {
char bytes[LINE_MAX];
src/libsystemd/sd-id128/id128-util.c
+4 -4
View File
@@ -1,19 +1,19 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <fcntl.h>
#include <stdlib.h>
#include <sys/socket.h>
#include <unistd.h>
#include "fd-util.h"
#include "fs-util.h"
#include "hexdecoct.h"
#include "hash-funcs.h"
#include "id128-util.h"
#include "io-util.h"
#include "log.h"
#include "namespace-util.h"
#include "process-util.h"
#include "sha256.h"
#include "stdio-util.h"
#include "siphash24.h"
#include "string-util.h"
#include "strv.h"
#include "sync-util.h"
src/libsystemd/sd-id128/id128-util.h
+1 -5
View File
@@ -1,14 +1,10 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <fcntl.h>
#include <stdbool.h>
#include "sd-id128.h"
#include "errno-util.h"
#include "hash-funcs.h"
#include "macro.h"
#include "forward.h"
bool id128_is_valid(const char *s) _pure_;
src/libsystemd/sd-id128/sd-id128.c
+1 -5
View File
@@ -1,9 +1,8 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <fcntl.h>
#include <stdlib.h>
#include <threads.h>
#include <unistd.h>
#include "sd-id128.h"
@@ -13,10 +12,7 @@
#include "hexdecoct.h"
#include "hmac.h"
#include "id128-util.h"
#include "io-util.h"
#include "keyring-util.h"
#include "log.h"
#include "macro.h"
#include "missing_syscall.h"
#include "path-util.h"
#include "random-util.h"
src/libsystemd/sd-journal/audit-type.h
+1 -2
View File
@@ -3,8 +3,7 @@
#include <stdio.h>
#include "alloc-util.h"
#include "macro.h"
#include "forward.h"
const char* audit_type_to_string(int type);
int audit_type_from_string(const char *s);
src/libsystemd/sd-journal/catalog.c
+1 -4
View File
@@ -1,13 +1,11 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <fcntl.h>
#include <locale.h>
#include <stdio.h>
#include <stdlib.h>
#include <sys/mman.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <unistd.h>
#include "sd-id128.h"
@@ -22,7 +20,6 @@
#include "log.h"
#include "memory-util.h"
#include "mkdir.h"
#include "path-util.h"
#include "siphash24.h"
#include "sort-util.h"
#include "sparse-endian.h"
src/libsystemd/sd-journal/catalog.h
+1 -6
View File
@@ -1,12 +1,7 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdbool.h>
#include <stdio.h>
#include "sd-id128.h"
#include "hashmap.h"
#include "forward.h"
int catalog_import_file(OrderedHashmap **h, const char *path);
int catalog_update(const char *database, const char *root, const char* const *dirs);
src/libsystemd/sd-journal/fsprg.h
+1 -4
View File
@@ -7,10 +7,7 @@
* Contact: fsprg@point-at-infinity.org
*/
#include <inttypes.h>
#include <sys/types.h>
#include "macro.h"
#include "forward.h"
#ifdef __cplusplus
extern "C" {
src/libsystemd/sd-journal/journal-authenticate.c
+3
View File
@@ -2,7 +2,9 @@
#include <fcntl.h>
#include <sys/mman.h>
#include <sys/stat.h>
#include "alloc-util.h"
#include "fd-util.h"
#include "fsprg.h"
#include "gcrypt-util.h"
@@ -12,6 +14,7 @@
#include "journal-file.h"
#include "log.h"
#include "memory-util.h"
#include "string-util.h"
#include "time-util.h"
static void* fssheader_free(FSSHeader *p) {
src/libsystemd/sd-journal/journal-authenticate.h
+1 -2
View File
@@ -1,8 +1,7 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdbool.h>
#include "forward.h"
#include "journal-file.h"
int journal_file_append_tag(JournalFile *f);
src/libsystemd/sd-journal/journal-def.h
+1 -3
View File
@@ -1,11 +1,9 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <errno.h>
#include "sd-id128.h"
#include "macro.h"
#include "forward.h"
#include "sparse-endian.h"
/*
src/libsystemd/sd-journal/journal-file.c
+4 -4
View File
@@ -1,10 +1,9 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <fcntl.h>
#include <linux/magic.h>
#include <pthread.h>
#include <stddef.h>
#include <stdlib.h>
#include <sys/mman.h>
#include <sys/statvfs.h>
#include <sys/uio.h>
@@ -21,6 +20,7 @@
#include "format-util.h"
#include "fs-util.h"
#include "gcrypt-util.h"
#include "hashmap.h"
#include "id128-util.h"
#include "journal-authenticate.h"
#include "journal-def.h"
@@ -30,19 +30,19 @@
#include "log-ratelimit.h"
#include "lookup3.h"
#include "memory-util.h"
#include "missing_fs.h"
#include "parse-util.h"
#include "path-util.h"
#include "prioq.h"
#include "random-util.h"
#include "ratelimit.h"
#include "set.h"
#include "sort-util.h"
#include "stat-util.h"
#include "string-table.h"
#include "string-util.h"
#include "strv.h"
#include "siphash24.h"
#include "sync-util.h"
#include "time-util.h"
#include "user-util.h"
#include "xattr-util.h"
src/libsystemd/sd-journal/journal-file.h
+1 -8
View File
@@ -1,20 +1,13 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <inttypes.h>
#include <sys/uio.h>
#include "sd-event.h"
#include "sd-id128.h"
#include "compress.h"
#include "forward.h"
#include "gcrypt-util.h"
#include "hashmap.h"
#include "journal-def.h"
#include "missing_fcntl.h"
#include "mmap-cache.h"
#include "sparse-endian.h"
#include "time-util.h"
typedef struct JournalMetrics {
/* For all these: UINT64_MAX means "pick automatically", and 0 means "no limit enforced" */
src/libsystemd/sd-journal/journal-internal.h
+10 -18
View File
@@ -1,18 +1,10 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <inttypes.h>
#include <stdbool.h>
#include <sys/types.h>
#include "sd-id128.h"
#include "sd-journal.h"
#include "hashmap.h"
#include "journal-def.h"
#include "journal-file.h"
#include "list.h"
#include "prioq.h"
#include "forward.h"
#include "time-util.h"
#define JOURNAL_FILES_MAX 7168u
@@ -28,7 +20,7 @@ typedef enum MatchType {
MATCH_AND_TERM,
} MatchType;
struct Match {
typedef struct Match {
MatchType type;
Match *parent;
LIST_FIELDS(Match, matches);
@@ -40,9 +32,9 @@ struct Match {
/* For terms */
LIST_HEAD(Match, matches);
};
} Match;
struct Location {
typedef struct Location {
LocationType type;
bool seqnum_set:1;
@@ -59,22 +51,22 @@ struct Location {
sd_id128_t boot_id;
uint64_t xor_hash;
};
} Location;
struct Directory {
typedef struct Directory {
sd_journal *journal;
char *path;
int wd;
bool is_root;
unsigned last_seen_generation;
};
} Directory;
typedef struct NewestByBootId {
sd_id128_t boot_id;
Prioq *prioq; /* JournalFile objects ordered by monotonic timestamp of last update. */
} NewestByBootId;
struct sd_journal {
typedef struct sd_journal {
int toplevel_fd;
char *path;
@@ -134,7 +126,7 @@ struct sd_journal {
Hashmap *directories_by_wd;
Hashmap *errors;
};
} sd_journal;
char* journal_make_match_string(sd_journal *j);
void journal_print_header(sd_journal *j);
src/libsystemd/sd-journal/journal-send.c
-6
View File
@@ -1,10 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <fcntl.h>
#include <printf.h>
#include <stddef.h>
#include <sys/un.h>
#include <unistd.h>
#if HAVE_VALGRIND_VALGRIND_H
# include <valgrind/valgrind.h>
@@ -24,7 +19,6 @@
#include "log.h"
#include "memfd-util.h"
#include "missing_mman.h"
#include "missing_syscall.h"
#include "process-util.h"
#include "socket-util.h"
#include "stdio-util.h"
src/libsystemd/sd-journal/journal-send.h
-3
View File
@@ -1,9 +1,6 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdbool.h>
#include <stddef.h>
#include "syslog-util.h"
int journal_fd_nonblock(bool nonblock);
src/libsystemd/sd-journal/journal-vacuum.c
-1
View File
@@ -12,7 +12,6 @@
#include "format-util.h"
#include "fs-util.h"
#include "journal-def.h"
#include "journal-file.h"
#include "journal-internal.h"
#include "journal-vacuum.h"
#include "log.h"
src/libsystemd/sd-journal/journal-vacuum.h
+1 -4
View File
@@ -1,9 +1,6 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <inttypes.h>
#include <stdbool.h>
#include "time-util.h"
#include "forward.h"
int journal_directory_vacuum(const char *directory, uint64_t max_use, uint64_t n_max_files, usec_t max_retention_usec, usec_t *oldest_usec, bool verbose);
src/libsystemd/sd-journal/journal-verify.c
+1 -4
View File
@@ -1,9 +1,7 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <fcntl.h>
#include <stddef.h>
#include <sys/mman.h>
#include <unistd.h>
#include "alloc-util.h"
#include "ansi-color.h"
@@ -17,9 +15,8 @@
#include "journal-file.h"
#include "journal-verify.h"
#include "log.h"
#include "lookup3.h"
#include "macro.h"
#include "terminal-util.h"
#include "time-util.h"
#include "tmpfile-util.h"
static void draw_progress(uint64_t p, usec_t *last_usec) {
src/libsystemd/sd-journal/lookup3.h
+1 -4
View File
@@ -1,10 +1,7 @@
/* SPDX-License-Identifier: LicenseRef-lookup3-public-domain */
#pragma once
#include <inttypes.h>
#include <sys/types.h>
#include "macro.h"
#include "forward.h"
uint32_t jenkins_hashword(const uint32_t *k, size_t length, uint32_t initval) _pure_;
void jenkins_hashword2(const uint32_t *k, size_t length, uint32_t *pc, uint32_t *pb);
src/libsystemd/sd-journal/mmap-cache.c
-2
View File
@@ -1,6 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <stdlib.h>
#include <sys/mman.h>
@@ -11,7 +10,6 @@
#include "hashmap.h"
#include "list.h"
#include "log.h"
#include "macro.h"
#include "memory-util.h"
#include "mmap-cache.h"
#include "sigbus.h"
src/libsystemd/sd-journal/mmap-cache.h
+1 -5
View File
@@ -1,12 +1,8 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <errno.h>
#include <stdbool.h>
#include <sys/stat.h>
#include "forward.h"
#include "journal-def.h"
#include "memory-util.h"
typedef struct MMapCache MMapCache;
typedef struct MMapFileDescriptor MMapFileDescriptor;
src/libsystemd/sd-journal/sd-journal.c
+5 -7
View File
@@ -1,11 +1,8 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <fcntl.h>
#include <inttypes.h>
#include <linux/magic.h>
#include <poll.h>
#include <stddef.h>
#include <stdlib.h>
#include <sys/inotify.h>
#include <sys/vfs.h>
#include <unistd.h>
@@ -14,14 +11,13 @@
#include "alloc-util.h"
#include "catalog.h"
#include "compress.h"
#include "dirent-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 "hashmap.h"
#include "hostname-util.h"
#include "id128-util.h"
@@ -31,19 +27,21 @@
#include "journal-file.h"
#include "journal-internal.h"
#include "list.h"
#include "log.h"
#include "lookup3.h"
#include "nulstr-util.h"
#include "origin-id.h"
#include "path-util.h"
#include "prioq.h"
#include "process-util.h"
#include "replace-var.h"
#include "set.h"
#include "sort-util.h"
#include "stat-util.h"
#include "stdio-util.h"
#include "string-util.h"
#include "strv.h"
#include "syslog-util.h"
#include "time-util.h"
#include "uid-classification.h"
#define JOURNAL_FILES_RECHECK_USEC (2 * USEC_PER_SEC)
src/libsystemd/sd-journal/test-catalog.c
+1 -7
View File
@@ -1,7 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <fcntl.h>
#include <locale.h>
#include <unistd.h>
@@ -10,12 +8,8 @@
#include "alloc-util.h"
#include "catalog.h"
#include "fd-util.h"
#include "fs-util.h"
#include "hashmap.h"
#include "log.h"
#include "macro.h"
#include "path-util.h"
#include "string-util.h"
#include "strv.h"
#include "tests.h"
#include "tmpfile-util.h"
src/libsystemd/sd-journal/test-journal-append.c
+1 -4
View File
@@ -6,8 +6,6 @@
#include <unistd.h>
#include "chattr-util.h"
#include "fd-util.h"
#include "fs-util.h"
#include "iovec-util.h"
#include "journal-file-util.h"
#include "log.h"
@@ -15,9 +13,8 @@
#include "parse-util.h"
#include "random-util.h"
#include "rm-rf.h"
#include "strv.h"
#include "terminal-util.h"
#include "tests.h"
#include "time-util.h"
#include "tmpfile-util.h"
static int journal_append_message(JournalFile *mj, const char *message) {

Some files were not shown because too many files have changed in this diff Show More