BUILD: stick-table: fix build errors introduced by last stick-table change
Last commit 1a693fc2fd ("MEDIUM: cli: Allow multiple filter entries for "show table"")
broke the build at two places:
src/stick_table.c: In function 'table_prepare_data_request':
src/stick_table.c:3620:33: warning: ordered comparison of pointer with integer zero [-Wextra]
src/stick_table.c: In function 'cli_io_handler_table':
src/stick_table.c:3763:5: error: 'for' loop initial declarations are only allowed in C99 mode
src/stick_table.c:3763:5: note: use option -std=c99 or -std=gnu99 to compile your code
make: *** [src/stick_table.o] Error 1
This patch fixes both. No backport needed.
diff --git a/src/stick_table.c b/src/stick_table.c
index 1393b1f..e4eca98 100644
--- a/src/stick_table.c
+++ b/src/stick_table.c
@@ -3617,7 +3617,7 @@
return cli_err(appctx, "Data type not stored in this table\n");
appctx->ctx.table.data_op[i] = get_std_op(args[4+3*i]);
- if (appctx->ctx.table.data_op < 0)
+ if (appctx->ctx.table.data_op[i] < 0)
return cli_err(appctx, "Require and operator among \"eq\", \"ne\", \"le\", \"ge\", \"lt\", \"gt\"\n");
if (!*args[5] || strl2llrc(args[5+3*i], strlen(args[5+3*i]), &appctx->ctx.table.value[i]) != 0)
@@ -3755,12 +3755,12 @@
if (appctx->ctx.table.data_type[0] >= 0) {
/* we're filtering on some data contents */
void *ptr;
- int dt;
+ int dt, i;
signed char op;
long long data, value;
- for (int i = 0; i < STKTABLE_FILTER_LEN; i++) {
+ for (i = 0; i < STKTABLE_FILTER_LEN; i++) {
if (appctx->ctx.table.data_type[i] == -1)
break;
dt = appctx->ctx.table.data_type[i];