From 0c437f4d35fc16967e2128b7e6775357eb7509b0 Mon Sep 17 00:00:00 2001 From: David Carlier Date: Wed, 27 Apr 2016 16:21:56 +0100 Subject: [PATCH] MINOR: lua: migrate the argument mask to 64 bits type. Recently the maximum number of arguments were ported to 12 due to the migration to 64 bits. So we allow lua to extend for both converters and fetches. --- src/hlua.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/hlua.c b/src/hlua.c index 221a7811b..f6eb8aa80 100644 --- a/src/hlua.c +++ b/src/hlua.c @@ -226,7 +226,7 @@ static const char error_500[] = static int hlua_arg2lua(lua_State *L, const struct arg *arg); static int hlua_lua2arg(lua_State *L, int ud, struct arg *arg); __LJMP static int hlua_lua2arg_check(lua_State *L, int first, struct arg *argp, - unsigned int mask, struct proxy *p); + uint64_t mask, struct proxy *p); static int hlua_smp2lua(lua_State *L, struct sample *smp); static int hlua_smp2lua_str(lua_State *L, struct sample *smp); static int hlua_lua2smp(lua_State *L, int ud, struct sample *smp); @@ -560,7 +560,7 @@ static int hlua_lua2smp(lua_State *L, int ud, struct sample *smp) * entries. */ __LJMP int hlua_lua2arg_check(lua_State *L, int first, struct arg *argp, - unsigned int mask, struct proxy *p) + uint64_t mask, struct proxy *p) { int min_arg; int idx; @@ -5380,7 +5380,7 @@ __LJMP static int hlua_register_converters(lua_State *L) snprintf((char *)sck->kw[0].kw, len, "lua.%s", name); sck->kw[0].process = hlua_sample_conv_wrapper; - sck->kw[0].arg_mask = ARG5(0,STR,STR,STR,STR,STR); + sck->kw[0].arg_mask = ARG12(0,STR,STR,STR,STR,STR,STR,STR,STR,STR,STR,STR,STR); sck->kw[0].val_args = NULL; sck->kw[0].in_type = SMP_T_STR; sck->kw[0].out_type = SMP_T_STR; @@ -5437,7 +5437,7 @@ __LJMP static int hlua_register_fetches(lua_State *L) snprintf((char *)sfk->kw[0].kw, len, "lua.%s", name); sfk->kw[0].process = hlua_sample_fetch_wrapper; - sfk->kw[0].arg_mask = ARG5(0,STR,STR,STR,STR,STR); + sfk->kw[0].arg_mask = ARG12(0,STR,STR,STR,STR,STR,STR,STR,STR,STR,STR,STR,STR); sfk->kw[0].val_args = NULL; sfk->kw[0].out_type = SMP_T_STR; sfk->kw[0].use = SMP_USE_HTTP_ANY;