From 8f3bc8ffcad8dfd6a58722b04026771943b463d3 Mon Sep 17 00:00:00 2001 From: Tim Duesterhus Date: Thu, 15 Apr 2021 18:14:32 +0200 Subject: [PATCH] CLEANUP: sample: Explicitly handle all possible enum values from mjson This makes it easier to find bugs, because -Wswitch can help us. --- src/sample.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/sample.c b/src/sample.c index c2d9beda3..89c443757 100644 --- a/src/sample.c +++ b/src/sample.c @@ -3774,8 +3774,19 @@ static int sample_conv_json_query(const struct arg *args, struct sample *smp, vo } break; } - default: - /* no valid token found */ + case MJSON_TOK_NULL: + case MJSON_TOK_ARRAY: + case MJSON_TOK_OBJECT: + /* We cannot handle these. */ + return 0; + case MJSON_TOK_INVALID: + /* Nothing matches the query. */ + return 0; + case MJSON_TOK_KEY: + /* This is not a valid return value according to the + * mjson documentation, but we handle it to benefit + * from '-Wswitch'. + */ return 0; } return 1;