From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Sat, 4 Jun 2022 19:07:27 +0000 (+0200)
Subject: various: use CONST_MAX for array allocation
X-Git-Tag: v252-rc1~848^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F23616%2Fhead;p=thirdparty%2Fsystemd.git

various: use CONST_MAX for array allocation

IIUC, with MAX() we get a VLA and the size is "decided" at runtime,
even though the result is always the same, but with CONST_MAX() we
get a normal stack variable.
---

diff --git a/src/shared/logs-show.c b/src/shared/logs-show.c
index acc1dc9b951..1cd28358164 100644
--- a/src/shared/logs-show.c
+++ b/src/shared/logs-show.c
@@ -339,7 +339,7 @@ static int output_timestamp_monotonic(FILE *f, sd_journal *j, const char *monoto
 }
 
 static int output_timestamp_realtime(FILE *f, sd_journal *j, OutputMode mode, OutputFlags flags, const char *realtime) {
-        char buf[MAX(FORMAT_TIMESTAMP_MAX, 64U)];
+        char buf[CONST_MAX(FORMAT_TIMESTAMP_MAX, 64U)];
         uint64_t x;
         int r;
 
diff --git a/src/test/test-time-util.c b/src/test/test-time-util.c
index 86a60604da1..e8e4e2a67bb 100644
--- a/src/test/test-time-util.c
+++ b/src/test/test-time-util.c
@@ -314,7 +314,7 @@ TEST(usec_sub_signed) {
 
 TEST(format_timestamp) {
         for (unsigned i = 0; i < 100; i++) {
-                char buf[MAX(FORMAT_TIMESTAMP_MAX, FORMAT_TIMESPAN_MAX)];
+                char buf[CONST_MAX(FORMAT_TIMESTAMP_MAX, FORMAT_TIMESPAN_MAX)];
                 usec_t x, y;
 
                 x = random_u64_range(2147483600 * USEC_PER_SEC) + 1;
@@ -374,7 +374,7 @@ TEST(FORMAT_TIMESTAMP) {
 }
 
 TEST(format_timestamp_relative) {
-        char buf[MAX(FORMAT_TIMESTAMP_MAX, FORMAT_TIMESPAN_MAX)];
+        char buf[CONST_MAX(FORMAT_TIMESTAMP_MAX, FORMAT_TIMESPAN_MAX)];
         usec_t x;
 
         /* Only testing timestamps in the past so we don't need to add some delta to account for time passing