From: Thierry FOURNIER Date: Tue, 17 Feb 2015 15:09:00 +0000 (+0100) Subject: BUG/MINOR: ARG6 and ARG7 don't fit in a 32 bits word X-Git-Tag: v1.6-dev1~138 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=70fd7480f9919b1b43abf9e169cccf29d07a8c47;p=thirdparty%2Fhaproxy.git BUG/MINOR: ARG6 and ARG7 don't fit in a 32 bits word The patch "MEDIUM: args: increase arg type to 5 bits and limit arg count to 5" (dbc79d0a) increased the number of types supported, but forgot to remove the ARG6/ARG7 macros. --- diff --git a/include/proto/arg.h b/include/proto/arg.h index bf33dfb28d..e051de54d0 100644 --- a/include/proto/arg.h +++ b/include/proto/arg.h @@ -48,12 +48,6 @@ #define ARG5(m, t1, t2, t3, t4, t5) \ (ARG4(m, t1, t2, t3, t4) + (ARGT_##t5 << (ARGM_BITS + ARGT_BITS * 4))) -#define ARG6(m, t1, t2, t3, t4, t5, t6) \ - (ARG5(m, t1, t2, t3, t4, t5) + (ARGT_##t6 << (ARGM_BITS + ARGT_BITS * 5))) - -#define ARG7(m, t1, t2, t3, t4, t5, t6, t7) \ - (ARG6(m, t1, t2, t3, t4, t5, t6) + (ARGT_##t7 << (ARGM_BITS + ARGT_BITS * 6))) - /* This dummy arg list may be used by default when no arg is found, it helps * parsers by removing pointer checks. */