Revert "logs-show: declare [static 2] on all highlight parameters"

This reverts commit 5444520628830aacab85be630a6cdeb179ff510b.

See: https://github.com/systemd/systemd/pull/15706

diff --git a/src/shared/logs-show.c b/src/shared/logs-show.c
index a55d30744704bec121513b228a078c2b69240a73..6737cda1d278e0228237eeed4dd98715cd14d614 100644 (file)
--- a/src/shared/logs-show.c
+++ b/src/shared/logs-show.c
@@ -158,7 +158,7 @@ static bool print_multiline(
                 bool audit,
                 const char* message,
                 size_t message_len,
-                size_t highlight[static 2]) {
+                size_t highlight[2]) {
 
         const char *color_on = "", *color_off = "", *highlight_on = "";
         const char *pos, *end;
@@ -370,7 +370,7 @@ static int output_short(
                 unsigned n_columns,
                 OutputFlags flags,
                 Set *output_fields,
-                const size_t highlight[static 2]) {
+                const size_t highlight[2]) {
 
         int r;
         const void *data;
@@ -534,7 +534,7 @@ static int output_verbose(
                 unsigned n_columns,
                 OutputFlags flags,
                 Set *output_fields,
-                const size_t highlight[static 2]) {
+                const size_t highlight[2]) {
 
         const void *data;
         size_t length;
@@ -653,7 +653,7 @@ static int output_export(
                 unsigned n_columns,
                 OutputFlags flags,
                 Set *output_fields,
-                const size_t highlight[static 2]) {
+                const size_t highlight[2]) {
 
         sd_id128_t boot_id;
         char sid[SD_ID128_STRING_MAX];
@@ -883,7 +883,7 @@ static int output_json(
                 unsigned n_columns,
                 OutputFlags flags,
                 Set *output_fields,
-                const size_t highlight[static 2]) {
+                const size_t highlight[2]) {
 
         char sid[SD_ID128_STRING_MAX], usecbuf[DECIMAL_STR_MAX(usec_t)];
         _cleanup_(json_variant_unrefp) JsonVariant *object = NULL;
@@ -1021,7 +1021,7 @@ static int output_cat_field(
                 sd_journal *j,
                 OutputFlags flags,
                 const char *field,
-                const size_t highlight[static 2]) {
+                const size_t highlight[2]) {
 
         const char *highlight_on, *highlight_off;
         const void *data;
@@ -1074,7 +1074,7 @@ static int output_cat(
                 unsigned n_columns,
                 OutputFlags flags,
                 Set *output_fields,
-                const size_t highlight[static 2]) {
+                const size_t highlight[2]) {
 
         const char *field;
         Iterator iterator;
@@ -1104,7 +1104,7 @@ static int (*output_funcs[_OUTPUT_MODE_MAX])(
                 unsigned n_columns,
                 OutputFlags flags,
                 Set *output_fields,
-                const size_t highlight[static 2]) = {
+                const size_t highlight[2]) = {
 
         [OUTPUT_SHORT]             = output_short,
         [OUTPUT_SHORT_ISO]         = output_short,
@@ -1130,7 +1130,7 @@ int show_journal_entry(
                 unsigned n_columns,
                 OutputFlags flags,
                 char **output_fields,
-                const size_t highlight[static 2],
+                const size_t highlight[2],
                 bool *ellipsized) {
 
         int ret;

diff --git a/src/shared/logs-show.h b/src/shared/logs-show.h
index 62be1b157f4fe97208224deb2b5417eaaed079b4..345efa4b2bbd091697d7bda97328ed5d5e008f4d 100644 (file)
--- a/src/shared/logs-show.h
+++ b/src/shared/logs-show.h
@@ -20,7 +20,7 @@ int show_journal_entry(
                 unsigned n_columns,
                 OutputFlags flags,
                 char **output_fields,
-                const size_t highlight[static 2],
+                const size_t highlight[2],
                 bool *ellipsized);
 int show_journal(
                 FILE *f,