commit 8dd5115edee9e778d3b45d0924530ee49a4e34e6
author Jason Evans <je@fb.com> Wed Feb 24 11:00:40 2016 -0800
committer Jason Evans <je@fb.com> Wed Feb 24 13:03:48 2016 -0800
tree 7fb91d01034d94dc6259d31f0ef6e7aab40e52df
parent 9f4ee6034c3ac6a8c8b5f9a0d76822fb2fd90c41

Explicitly cast mib[] elements to unsigned where appropriate.

src/ctl.c

diff --git a/src/ctl.c b/src/ctl.c
index f003b41..a7f1b67 100644
--- a/src/ctl.c
+++ b/src/ctl.c
@@ -24,7 +24,7 @@
 }
 
 JEMALLOC_INLINE_C const ctl_named_node_t *
-ctl_named_children(const ctl_named_node_t *node, int index)
+ctl_named_children(const ctl_named_node_t *node, size_t index)
 {
 	const ctl_named_node_t *children = ctl_named_node(node->children);
 
@@ -975,7 +975,7 @@
 		assert(node->nchildren > 0);
 		if (ctl_named_node(node->children) != NULL) {
 			/* Children are named. */
-			if (node->nchildren <= mib[i]) {
+			if (node->nchildren <= (unsigned)mib[i]) {
 				ret = ENOENT;
 				goto label_return;
 			}
@@ -1611,7 +1611,7 @@
 
 	READONLY();
 	WRITEONLY();
-	arena_i_purge(mib[1], true);
+	arena_i_purge((unsigned)mib[1], true);
 
 	ret = 0;
 label_return:
@@ -1626,7 +1626,7 @@
 
 	READONLY();
 	WRITEONLY();
-	arena_i_purge(mib[1], false);
+	arena_i_purge((unsigned)mib[1], false);
 
 	ret = 0;
 label_return:
@@ -1639,7 +1639,7 @@
 {
 	int ret;
 	const char *dss = NULL;
-	unsigned arena_ind = mib[1];
+	unsigned arena_ind = (unsigned)mib[1];
 	dss_prec_t dss_prec_old = dss_prec_limit;
 	dss_prec_t dss_prec = dss_prec_limit;
 
@@ -1694,7 +1694,7 @@
     size_t *oldlenp, void *newp, size_t newlen)
 {
 	int ret;
-	unsigned arena_ind = mib[1];
+	unsigned arena_ind = (unsigned)mib[1];
 	arena_t *arena;
 
 	arena = arena_get(tsd_fetch(), arena_ind, false, true);
@@ -1728,7 +1728,7 @@
     size_t *oldlenp, void *newp, size_t newlen)
 {
 	int ret;
-	unsigned arena_ind = mib[1];
+	unsigned arena_ind = (unsigned)mib[1];
 	arena_t *arena;
 
 	arena = arena_get(tsd_fetch(), arena_ind, false, true);
@@ -1762,7 +1762,7 @@
     size_t *oldlenp, void *newp, size_t newlen)
 {
 	int ret;
-	unsigned arena_ind = mib[1];
+	unsigned arena_ind = (unsigned)mib[1];
 	arena_t *arena;
 
 	malloc_mutex_lock(&ctl_mtx);
@@ -1841,7 +1841,7 @@
 	if (*oldlenp != ctl_stats.narenas * sizeof(bool)) {
 		ret = EINVAL;
 		nread = (*oldlenp < ctl_stats.narenas * sizeof(bool))
-		    ? (*oldlenp / sizeof(bool)) : ctl_stats.narenas;
+		    ? (unsigned)(*oldlenp / sizeof(bool)) : ctl_stats.narenas;
 	} else {
 		ret = 0;
 		nread = ctl_stats.narenas;