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 9125831a9d9267c14898655f82e3742ee52f6c9a..2c6c919d42e08e2659514d5b1b0f4a398f88a61f 100644 (file)
--- 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 9db66897598c68e1f25a70480a1d636d70f05377..24be1d2f9be80b82fd4583412181799775c5cdbd 100644 (file)
--- 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;