about summary refs log tree commit diff
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2020-06-04 12:53:28 -0700
committerH.J. Lu <hjl.tools@gmail.com>2020-06-04 14:01:14 -0700
commit9b7424215b10ae01d680ef91e10fc10f51227177 (patch)
tree3372d08d1c178ffec2ede466213bb03a8bbc00d6
parent3f6e4fc4542b5b881906bf2f83eb4b8359b0dcd4 (diff)
downloadglibc-9b7424215b10ae01d680ef91e10fc10f51227177.tar.gz
glibc-9b7424215b10ae01d680ef91e10fc10f51227177.tar.xz
glibc-9b7424215b10ae01d680ef91e10fc10f51227177.zip
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 <carlos@redhat.com>
-rw-r--r--elf/dl-tunables.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/elf/dl-tunables.c b/elf/dl-tunables.c
index a1001fe313..26e6e26612 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;					      \
     }									      \
 })