[src/trunk]: src/external/bsd/jemalloc/dist/src fix for shadowing.

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

details:   https://anonhg.NetBSD.org/src/rev/2edcdf98b5c3
branches:  trunk
changeset: 449352:2edcdf98b5c3
user:      christos <christos%NetBSD.org@localhost>
date:      Mon Mar 04 17:20:07 2019 +0000

description:
fix for shadowing.

diffstat:

 external/bsd/jemalloc/dist/src/extent.c |  22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)

diffs (48 lines):

diff -r f4999fdbf0c6 -r 2edcdf98b5c3 external/bsd/jemalloc/dist/src/extent.c
--- a/external/bsd/jemalloc/dist/src/extent.c   Mon Mar 04 17:19:45 2019 +0000
+++ b/external/bsd/jemalloc/dist/src/extent.c   Mon Mar 04 17:20:07 2019 +0000
@@ -1113,14 +1113,14 @@
 
        if (*zero) {
                void *addr = extent_base_get(extent);
-               size_t size = extent_size_get(extent);
+               size_t sz = extent_size_get(extent);
                if (!extent_zeroed_get(extent)) {
-                       if (pages_purge_forced(addr, size)) {
-                               memset(addr, 0, size);
+                       if (pages_purge_forced(addr, sz)) {
+                               memset(addr, 0, sz);
                        }
                } else if (config_debug) {
                        size_t *p = (size_t *)(uintptr_t)addr;
-                       for (size_t i = 0; i < size / sizeof(size_t); i++) {
+                       for (size_t i = 0; i < sz / sizeof(size_t); i++) {
                                assert(p[i] == 0);
                        }
                }
@@ -1365,18 +1365,18 @@
                extent_addr_randomize(tsdn, extent, alignment);
        }
        if (slab) {
-               rtree_ctx_t rtree_ctx_fallback;
-               rtree_ctx_t *rtree_ctx = tsdn_rtree_ctx(tsdn,
-                   &rtree_ctx_fallback);
+               rtree_ctx_t rtree_ctx_fallback1;
+               rtree_ctx_t *rtree_ctx1 = tsdn_rtree_ctx(tsdn,
+                   &rtree_ctx_fallback1);
 
                extent_slab_set(extent, true);
-               extent_interior_register(tsdn, rtree_ctx, extent, szind);
+               extent_interior_register(tsdn, rtree_ctx1, extent, szind);
        }
        if (*zero && !extent_zeroed_get(extent)) {
                void *addr = extent_base_get(extent);
-               size_t size = extent_size_get(extent);
-               if (pages_purge_forced(addr, size)) {
-                       memset(addr, 0, size);
+               size_t sz = extent_size_get(extent);
+               if (pages_purge_forced(addr, sz)) {
+                       memset(addr, 0, sz);
                }
        }