expression: add __EXPR_MAX and use it to define EXPR_MAX

EXPR_MAX was never updated to the newest expression, add __EXPR_MAX and
use it to define EXPR_MAX.

Add case to expr_ops() other gcc complains with a warning on the
__EXPR_MAX case is not handled.

Fixes: 347039f64509 ("src: add symbol range expression to further compact intervals")
Suggested-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/include/expression.h b/include/expression.h
index 8472748621ef78dab37051de38fe91c97e43f206..6e8675b0cc1a1fbc86b6c2ac40735231d111672b 100644 (file)
--- a/include/expression.h
+++ b/include/expression.h
@@ -84,9 +84,9 @@ enum expr_types {
        EXPR_FLAGCMP,
        EXPR_RANGE_VALUE,
        EXPR_RANGE_SYMBOL,
-
-       EXPR_MAX = EXPR_FLAGCMP
+       __EXPR_MAX
 };
+#define EXPR_MAX       (__EXPR_MAX - 1)
 
 enum ops {
        OP_INVALID,

diff --git a/src/expression.c b/src/expression.c
index 156a66eb37f01fb120029b2cbd90c37151899184..52e4c7d187ac1435a05464648220cf53fc2e3079 100644 (file)
--- a/src/expression.c
+++ b/src/expression.c
@@ -1794,6 +1794,7 @@ static const struct expr_ops *__expr_ops_by_type(enum expr_types etype)
        case EXPR_FLAGCMP: return &flagcmp_expr_ops;
        case EXPR_RANGE_VALUE: return &constant_range_expr_ops;
        case EXPR_RANGE_SYMBOL: return &symbol_range_expr_ops;
+       case __EXPR_MAX: break;
        }
 
        return NULL;