From 2bf49d5a64c6c85cdc7f787c6f5116dd6b99010a Mon Sep 17 00:00:00 2001 From: Thomas Schoebel-Theuer Date: Fri, 29 Jan 2021 10:16:51 +0100 Subject: [PATCH] infra: comply to ISO C90 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit block/mars/kernel/sy_old/sy_generic.c:3164:2: warning: ISO C90 forbids variable length array ‘paths’ [-Wvla] --- kernel/sy_old/sy_generic.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/kernel/sy_old/sy_generic.c b/kernel/sy_old/sy_generic.c index b6124ecc..331b4233 100644 --- a/kernel/sy_old/sy_generic.c +++ b/kernel/sy_old/sy_generic.c @@ -3142,6 +3142,8 @@ EXPORT_SYMBOL_GPL(_aio_brick_type); const struct generic_brick_type *_sio_brick_type = NULL; EXPORT_SYMBOL_GPL(_sio_brick_type); +#define MAX_PREV_COUNT 8 + struct mars_brick *make_brick_all( struct mars_global *global, struct mars_dent *belongs, @@ -3161,12 +3163,18 @@ struct mars_brick *make_brick_all( const char *new_path; char *_new_path = NULL; struct mars_brick *brick = NULL; - char *paths[prev_count + 1]; - struct mars_brick *prev[prev_count + 1]; + char *paths[MAX_PREV_COUNT]; + struct mars_brick *prev[MAX_PREV_COUNT]; bool switch_state; int i; int status; + if (prev_count >= MAX_PREV_COUNT) { + MARS_ERR("internal: prev_count=%d too high!\n", + prev_count); + goto err; + } + // treat variable arguments va_start(args, prev_count); if (new_fmt) {