From: H.J. Lu Date: Thu, 4 Jun 2020 19:53:28 +0000 (-0700) Subject: Replace val with __val in TUNABLE_SET_VAL_IF_VALID_RANGE X-Git-Tag: glibc-2.32~259 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9b7424215b10ae01d680ef91e10fc10f51227177;p=thirdparty%2Fglibc.git Replace val with __val in TUNABLE_SET_VAL_IF_VALID_RANGE There are: #define TUNABLE_SET_VAL_IF_VALID_RANGE(__cur, __val, __type) \ ({ \ __type min = (__cur)->type.min; \ __type max = (__cur)->type.max; \ \ if ((__type) (__val) >= min && (__type) (val) <= max) \ ^^^ Should be __val { \ (__cur)->val.numval = val; \ ^^^ Should be __val (__cur)->initialized = true; \ } \ }) Luckily since all TUNABLE_SET_VAL_IF_VALID_RANGE usages are TUNABLE_SET_VAL_IF_VALID_RANGE (cur, val, int64_t); this didn't cause any issues. Reviewed-by: Carlos O'Donell --- diff --git a/elf/dl-tunables.c b/elf/dl-tunables.c index a1001fe3130..26e6e266120 100644 --- a/elf/dl-tunables.c +++ b/elf/dl-tunables.c @@ -93,9 +93,9 @@ get_next_env (char **envp, char **name, size_t *namelen, char **val, __type min = (__cur)->type.min; \ __type max = (__cur)->type.max; \ \ - if ((__type) (__val) >= min && (__type) (val) <= max) \ + if ((__type) (__val) >= min && (__type) (__val) <= max) \ { \ - (__cur)->val.numval = val; \ + (__cur)->val.numval = (__val); \ (__cur)->initialized = true; \ } \ })