From: Lennart Poettering Date: Mon, 24 Mar 2025 16:29:24 +0000 (-0400) Subject: journalctl: make arg_image_policy non-static, just like all other arg_xyz variables X-Git-Tag: v258-rc1~633^2~19 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5be930db9f7f887a638ddeffb165822db5211a70;p=thirdparty%2Fsystemd.git journalctl: make arg_image_policy non-static, just like all other arg_xyz variables Some refactoring to normalize behaviour here, and make arg_image_policy less special for no reason. --- diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c index 9125831a9d9..2c6c919d42e 100644 --- a/src/journal/journalctl.c +++ b/src/journal/journalctl.c @@ -94,7 +94,7 @@ Set *arg_output_fields = NULL; char *arg_pattern = NULL; pcre2_code *arg_compiled_pattern = NULL; PatternCompileCase arg_case = PATTERN_COMPILE_CASE_AUTO; -static ImagePolicy *arg_image_policy = NULL; +ImagePolicy *arg_image_policy = NULL; STATIC_DESTRUCTOR_REGISTER(arg_cursor, freep); STATIC_DESTRUCTOR_REGISTER(arg_cursor_file, freep); diff --git a/src/journal/journalctl.h b/src/journal/journalctl.h index 9db66897598..24be1d2f9be 100644 --- a/src/journal/journalctl.h +++ b/src/journal/journalctl.h @@ -7,6 +7,7 @@ #include "sd-id128.h" #include "sd-json.h" +#include "image-policy.h" #include "output-mode.h" #include "pager.h" #include "pcre2-util.h" @@ -97,6 +98,7 @@ extern Set *arg_output_fields; extern char *arg_pattern; extern pcre2_code *arg_compiled_pattern; extern PatternCompileCase arg_case; +extern ImagePolicy *arg_image_policy; static inline bool arg_lines_needs_seek_end(void) { return arg_lines >= 0 && !arg_lines_oldest;