[src/trunk]: src/external/bsd/jemalloc/dist/include/jemalloc/internal - fix s...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/4ca4cf481df3
branches:  trunk
changeset: 449384:4ca4cf481df3
user:      christos <christos%NetBSD.org@localhost>
date:      Mon Mar 04 20:06:31 2019 +0000

description:
- fix shadowing
- add constcond

diffstat:

 external/bsd/jemalloc/dist/include/jemalloc/internal/ph.h |  28 +++++++-------
 1 files changed, 14 insertions(+), 14 deletions(-)

diffs (82 lines):

diff -r 9bd877c55dda -r 4ca4cf481df3 external/bsd/jemalloc/dist/include/jemalloc/internal/ph.h
--- a/external/bsd/jemalloc/dist/include/jemalloc/internal/ph.h Mon Mar 04 20:06:11 2019 +0000
+++ b/external/bsd/jemalloc/dist/include/jemalloc/internal/ph.h Mon Mar 04 20:06:31 2019 +0000
@@ -34,19 +34,19 @@
        (a_phn->a_field.phn_lchild)
 #define phn_lchild_set(a_type, a_field, a_phn, a_lchild) do {          \
        a_phn->a_field.phn_lchild = a_lchild;                           \
-} while (0)
+} while (/*CONSTCOND*/0)
 
 #define phn_next_get(a_type, a_field, a_phn)                           \
        (a_phn->a_field.phn_next)
 #define phn_prev_set(a_type, a_field, a_phn, a_prev) do {              \
        a_phn->a_field.phn_prev = a_prev;                               \
-} while (0)
+} while (/*CONSTCOND*/0)
 
 #define phn_prev_get(a_type, a_field, a_phn)                           \
        (a_phn->a_field.phn_prev)
 #define phn_next_set(a_type, a_field, a_phn, a_next) do {              \
        a_phn->a_field.phn_next = a_next;                               \
-} while (0)
+} while (/*CONSTCOND*/0)
 
 #define phn_merge_ordered(a_type, a_field, a_phn0, a_phn1, a_cmp) do { \
        a_type *phn0child;                                              \
@@ -62,7 +62,7 @@
                phn_prev_set(a_type, a_field, phn0child, a_phn1);       \
        }                                                               \
        phn_lchild_set(a_type, a_field, a_phn0, a_phn1);                \
-} while (0)
+} while (/*CONSTCOND*/0)
 
 #define phn_merge(a_type, a_field, a_phn0, a_phn1, a_cmp, r_phn) do {  \
        if (a_phn0 == NULL) {                                           \
@@ -78,7 +78,7 @@
                    a_cmp);                                             \
                r_phn = a_phn1;                                         \
        }                                                               \
-} while (0)
+} while (/*CONSTCOND*/0)
 
 #define ph_merge_siblings(a_type, a_field, a_phn, a_cmp, r_phn) do {   \
        a_type *head = NULL;                                            \
@@ -165,20 +165,20 @@
                }                                                       \
        }                                                               \
        r_phn = phn0;                                                   \
-} while (0)
+} while (/*CONSTCOND*/0)
 
 #define ph_merge_aux(a_type, a_field, a_ph, a_cmp) do {                        \
-       a_type *phn = phn_next_get(a_type, a_field, a_ph->ph_root);     \
-       if (phn != NULL) {                                              \
+       a_type *_phn = phn_next_get(a_type, a_field, a_ph->ph_root);    \
+       if (_phn != NULL) {                                             \
                phn_prev_set(a_type, a_field, a_ph->ph_root, NULL);     \
                phn_next_set(a_type, a_field, a_ph->ph_root, NULL);     \
-               phn_prev_set(a_type, a_field, phn, NULL);               \
-               ph_merge_siblings(a_type, a_field, phn, a_cmp, phn);    \
-               assert(phn_next_get(a_type, a_field, phn) == NULL);     \
-               phn_merge(a_type, a_field, a_ph->ph_root, phn, a_cmp,   \
+               phn_prev_set(a_type, a_field, _phn, NULL);              \
+               ph_merge_siblings(a_type, a_field, _phn, a_cmp, _phn);  \
+               assert(phn_next_get(a_type, a_field, _phn) == NULL);    \
+               phn_merge(a_type, a_field, a_ph->ph_root, _phn, a_cmp,  \
                    a_ph->ph_root);                                     \
        }                                                               \
-} while (0)
+} while (/*CONSTCOND*/0)
 
 #define ph_merge_children(a_type, a_field, a_phn, a_cmp, r_phn) do {   \
        a_type *lchild = phn_lchild_get(a_type, a_field, a_phn);        \
@@ -188,7 +188,7 @@
                ph_merge_siblings(a_type, a_field, lchild, a_cmp,       \
                    r_phn);                                             \
        }                                                               \
-} while (0)
+} while (/*CONSTCOND*/0)
 
 /*
  * The ph_proto() macro generates function prototypes that correspond to the