CLEANUP: stick-table/cli: remove the unneeded STATE_INIT for "show table"
This state is pointless now, it just serves to initialize the initial
table pointer while this can be done more easily in the parser, so let's
do that and drop that state.
diff --git a/src/stick_table.c b/src/stick_table.c
index 6b722cc..0e08d7d 100644
--- a/src/stick_table.c
+++ b/src/stick_table.c
@@ -4396,8 +4396,7 @@
signed char data_type[STKTABLE_FILTER_LEN]; /* type of data to compare, or -1 if none */
signed char data_op[STKTABLE_FILTER_LEN]; /* operator (STD_OP_*) when data_type set */
enum {
- STATE_INIT = 0, /* first call, init needed */
- STATE_NEXT, /* px points to next table, entry=NULL */
+ STATE_NEXT = 0, /* px points to next table, entry=NULL */
STATE_DUMP, /* px points to curr table, entry is valid, refcount held */
STATE_DONE, /* done dumping */
} state;
@@ -4629,11 +4628,12 @@
ctx->action = (long)private; // keyword argument, one of STK_CLI_ACT_*
if (*args[2]) {
- ctx->target = stktable_find_by_name(args[2]);
+ ctx->t = ctx->target = stktable_find_by_name(args[2]);
if (!ctx->target)
return cli_err(appctx, "No such table\n");
}
else {
+ ctx->t = stktables_list;
if (ctx->action != STK_CLI_ACT_SHOW)
goto err_args;
return 0;
@@ -4675,8 +4675,7 @@
int show = ctx->action == STK_CLI_ACT_SHOW;
/*
- * We have 4 possible states in ctx->state :
- * - STATE_INIT : the first call
+ * We have 3 possible states in ctx->state :
* - STATE_NEXT : the proxy pointer points to the next table to
* dump, the entry pointer is NULL ;
* - STATE_DUMP : the proxy pointer points to the current table
@@ -4698,15 +4697,6 @@
while (ctx->state != STATE_DONE) {
switch (ctx->state) {
- case STATE_INIT:
- ctx->t = ctx->target;
- if (!ctx->t)
- ctx->t = stktables_list;
-
- ctx->entry = NULL;
- ctx->state = STATE_NEXT;
- break;
-
case STATE_NEXT:
if (!ctx->t ||
(ctx->target &&