From: Lennart Poettering Date: Tue, 25 Mar 2025 20:44:30 +0000 (-0400) Subject: journald: rename stdout_stream_destroy() → stdout_stream_terminate() X-Git-Tag: v258-rc1~937^2~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ead537940cfda6e9d98e86a1f9af7dc1f4914e02;p=thirdparty%2Fsystemd.git journald: rename stdout_stream_destroy() → stdout_stream_terminate() --- diff --git a/src/journal/fuzz-journald-stream.c b/src/journal/fuzz-journald-stream.c index 3ad9e20222f..f9c6bfba10f 100644 --- a/src/journal/fuzz-journald-stream.c +++ b/src/journal/fuzz-journald-stream.c @@ -32,7 +32,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { sd_event_run(s->event, UINT64_MAX); if (s->n_stdout_streams > 0) - stdout_stream_destroy(stream); + stdout_stream_terminate(stream); return 0; } diff --git a/src/journal/journald-stream.c b/src/journal/journald-stream.c index 2ada374b739..e45765df0c9 100644 --- a/src/journal/journald-stream.c +++ b/src/journal/journald-stream.c @@ -137,7 +137,7 @@ StdoutStream* stdout_stream_free(StdoutStream *s) { DEFINE_TRIVIAL_CLEANUP_FUNC(StdoutStream*, stdout_stream_free); -void stdout_stream_destroy(StdoutStream *s) { +void stdout_stream_terminate(StdoutStream *s) { if (!s) return; @@ -649,7 +649,7 @@ static int stdout_stream_process(sd_event_source *es, int fd, uint32_t revents, return 1; terminate: - stdout_stream_destroy(s); + stdout_stream_terminate(s); return 0; } diff --git a/src/journal/journald-stream.h b/src/journal/journald-stream.h index 7b756c05ecc..71d3394ed9a 100644 --- a/src/journal/journald-stream.h +++ b/src/journal/journald-stream.h @@ -11,5 +11,5 @@ int server_restore_streams(Server *s, FDSet *fds); StdoutStream* stdout_stream_free(StdoutStream *s); int stdout_stream_install(Server *s, int fd, StdoutStream **ret); -void stdout_stream_destroy(StdoutStream *s); +void stdout_stream_terminate(StdoutStream *s); void stdout_stream_send_notify(StdoutStream *s);