src: fix always-true assertions

assert(1) is a no-op, this should be assert(0). Use BUG() instead.
Add missing CATCHALL to avoid BUG().

Signed-off-by: Florian Westphal <fw@strlen.de>

diff --git a/src/evaluate.c b/src/evaluate.c
index b5f74d2f505162ab878fbf78fe31c7edf282a623..1447a4c28aee390fc4775d01323ebfefde77ac8b 100644 (file)
--- a/src/evaluate.c
+++ b/src/evaluate.c
@@ -1499,7 +1499,7 @@ static int interval_set_eval(struct eval_ctx *ctx, struct set *set,
        case CMD_GET:
                break;
        default:
-               assert(1);
+               BUG("unhandled op %d\n", ctx->cmd->op);
                break;
        }
 

diff --git a/src/intervals.c b/src/intervals.c
index a74238525d8db4062b4d8db98bc669f55393819d..85ec59eda36a36e16973fa68306026d229b9815a 100644 (file)
--- a/src/intervals.c
+++ b/src/intervals.c
@@ -20,6 +20,7 @@ static void setelem_expr_to_range(struct expr *expr)
        assert(expr->etype == EXPR_SET_ELEM);
 
        switch (expr->key->etype) {
+       case EXPR_SET_ELEM_CATCHALL:
        case EXPR_RANGE:
                break;
        case EXPR_PREFIX:
@@ -53,7 +54,7 @@ static void setelem_expr_to_range(struct expr *expr)
                expr->key = key;
                break;
        default:
-               assert(1);
+               BUG("unhandled key type %d\n", expr->key->etype);
        }
 }
 
@@ -185,7 +186,7 @@ static struct expr *interval_expr_key(struct expr *i)
                elem = i;
                break;
        default:
-               assert(1);
+               BUG("unhandled expression type %d\n", i->etype);
                return NULL;
        }