Remove extraneous parens around return arguments.

This resolves #540.

test/include/test/btalloc.h

@@ -26,5 +26,5 @@ btalloc_##n(size_t size, unsigned bits) {				\
 	}								\
 	/* Intentionally sabotage tail call optimization. */		\
 	assert_ptr_not_null(p, "Unexpected mallocx() failure");		\
-	return (p);							\
+	return p;							\
 }

test/include/test/extent_hooks.h

@@ -86,12 +86,12 @@ extent_alloc_hook(extent_hooks_t *extent_hooks, void *new_addr, size_t size,
 	    "Wrong hook function");
 	called_alloc = true;
 	if (!try_alloc) {
-		return (NULL);
+		return NULL;
 	}
 	ret = default_hooks->alloc(default_hooks, new_addr, size, alignment,
 	    zero, commit, 0);
 	did_alloc = (ret != NULL);
-	return (ret);
+	return ret;
 }
 
 static bool
@@ -108,11 +108,11 @@ extent_dalloc_hook(extent_hooks_t *extent_hooks, void *addr, size_t size,
 	    "Wrong hook function");
 	called_dalloc = true;
 	if (!try_dalloc) {
-		return (true);
+		return true;
 	}
 	err = default_hooks->dalloc(default_hooks, addr, size, committed, 0);
 	did_dalloc = !err;
-	return (err);
+	return err;
 }
 
 static bool
@@ -129,12 +129,12 @@ extent_commit_hook(extent_hooks_t *extent_hooks, void *addr, size_t size,
 	    "Wrong hook function");
 	called_commit = true;
 	if (!try_commit) {
-		return (true);
+		return true;
 	}
 	err = default_hooks->commit(default_hooks, addr, size, offset, length,
 	    0);
 	did_commit = !err;
-	return (err);
+	return err;
 }
 
 static bool
@@ -151,12 +151,12 @@ extent_decommit_hook(extent_hooks_t *extent_hooks, void *addr, size_t size,
 	    "Wrong hook function");
 	called_decommit = true;
 	if (!try_decommit) {
-		return (true);
+		return true;
 	}
 	err = default_hooks->decommit(default_hooks, addr, size, offset, length,
 	    0);
 	did_decommit = !err;
-	return (err);
+	return err;
 }
 
 static bool
@@ -173,13 +173,13 @@ extent_purge_lazy_hook(extent_hooks_t *extent_hooks, void *addr, size_t size,
 	    "Wrong hook function");
 	called_purge_lazy = true;
 	if (!try_purge_lazy) {
-		return (true);
+		return true;
 	}
 	err = default_hooks->purge_lazy == NULL ||
 	    default_hooks->purge_lazy(default_hooks, addr, size, offset, length,
 	    0);
 	did_purge_lazy = !err;
-	return (err);
+	return err;
 }
 
 static bool
@@ -196,13 +196,13 @@ extent_purge_forced_hook(extent_hooks_t *extent_hooks, void *addr, size_t size,
 	    "Wrong hook function");
 	called_purge_forced = true;
 	if (!try_purge_forced) {
-		return (true);
+		return true;
 	}
 	err = default_hooks->purge_forced == NULL ||
 	    default_hooks->purge_forced(default_hooks, addr, size, offset,
 	    length, 0);
 	did_purge_forced = !err;
-	return (err);
+	return err;
 }
 
 static bool
@@ -220,13 +220,13 @@ extent_split_hook(extent_hooks_t *extent_hooks, void *addr, size_t size,
 	    "Wrong hook function");
 	called_split = true;
 	if (!try_split) {
-		return (true);
+		return true;
 	}
 	err = (default_hooks->split == NULL ||
 	    default_hooks->split(default_hooks, addr, size, size_a, size_b,
 	    committed, 0));
 	did_split = !err;
-	return (err);
+	return err;
 }
 
 static bool
@@ -244,13 +244,13 @@ extent_merge_hook(extent_hooks_t *extent_hooks, void *addr_a, size_t size_a,
 	    "Wrong hook function");
 	called_merge = true;
 	if (!try_merge) {
-		return (true);
+		return true;
 	}
 	err = (default_hooks->merge == NULL ||
 	    default_hooks->merge(default_hooks, addr_a, size_a, addr_b, size_b,
 	    committed, 0));
 	did_merge = !err;
-	return (err);
+	return err;
 }
 
 static void

test/include/test/math.h

@@ -36,9 +36,9 @@ ln_gamma(double x) {
 
 	z = 1.0 / (x * x);
 
-	return (f + (x-0.5) * log(x) - x + 0.918938533204673 +
+	return f + (x-0.5) * log(x) - x + 0.918938533204673 +
 	    (((-0.000595238095238 * z + 0.000793650793651) * z -
-	    0.002777777777778) * z + 0.083333333333333) / x);
+	    0.002777777777778) * z + 0.083333333333333) / x;
 }
 
 /*
@@ -60,7 +60,7 @@ i_gamma(double x, double p, double ln_gamma_p) {
 	assert(x >= 0.0);
 
 	if (x == 0.0) {
-		return (0.0);
+		return 0.0;
 	}
 
 	acu = 1.0e-10;
@@ -80,7 +80,7 @@ i_gamma(double x, double p, double ln_gamma_p) {
 			gin += term;
 			if (term <= acu) {
 				gin *= factor / p;
-				return (gin);
+				return gin;
 			}
 		}
 	} else {
@@ -107,7 +107,7 @@ i_gamma(double x, double p, double ln_gamma_p) {
 				dif = fabs(gin - rn);
 				if (dif <= acu && dif <= acu * rn) {
 					gin = 1.0 - factor * gin;
-					return (gin);
+					return gin;
 				}
 				gin = rn;
 			}
@@ -144,7 +144,7 @@ pt_norm(double p) {
 	if (fabs(q) <= 0.425) {
 		/* p close to 1/2. */
 		r = 0.180625 - q * q;
-		return (q * (((((((2.5090809287301226727e3 * r +
+		return q * (((((((2.5090809287301226727e3 * r +
 		    3.3430575583588128105e4) * r + 6.7265770927008700853e4) * r
 		    + 4.5921953931549871457e4) * r + 1.3731693765509461125e4) *
 		    r + 1.9715909503065514427e3) * r + 1.3314166789178437745e2)
@@ -153,7 +153,7 @@ pt_norm(double p) {
 		    2.8729085735721942674e4) * r + 3.9307895800092710610e4) * r
 		    + 2.1213794301586595867e4) * r + 5.3941960214247511077e3) *
 		    r + 6.8718700749205790830e2) * r + 4.2313330701600911252e1)
-		    * r + 1.0));
+		    * r + 1.0);
 	} else {
 		if (q < 0.0) {
 			r = p;
@@ -204,7 +204,7 @@ pt_norm(double p) {
 		if (q < 0.0) {
 			ret = -ret;
 		}
-		return (ret);
+		return ret;
 	}
 }
 
@@ -240,7 +240,7 @@ pt_chi2(double p, double df, double ln_gamma_df_2) {
 		/* Starting approximation for small Chi^2. */
 		ch = pow(p * xx * exp(ln_gamma_df_2 + xx * aa), 1.0 / xx);
 		if (ch - e < 0.0) {
-			return (ch);
+			return ch;
 		}
 	} else {
 		if (df > 0.32) {
@@ -279,7 +279,7 @@ pt_chi2(double p, double df, double ln_gamma_df_2) {
 		q = ch;
 		p1 = 0.5 * ch;
 		if (p1 < 0.0) {
-			return (-1.0);
+			return -1.0;
 		}
 		p2 = p - i_gamma(p1, xx, ln_gamma_df_2);
 		t = p2 * exp(xx * aa + ln_gamma_df_2 + p1 - c * log(ch));
@@ -301,7 +301,7 @@ pt_chi2(double p, double df, double ln_gamma_df_2) {
 		}
 	}
 
-	return (ch);
+	return ch;
 }
 
 /*
@@ -311,6 +311,6 @@ pt_chi2(double p, double df, double ln_gamma_df_2) {
  */
 JEMALLOC_INLINE double
 pt_gamma(double p, double shape, double scale, double ln_gamma_shape) {
-	return (pt_chi2(p, shape * 2.0, ln_gamma_shape) * 0.5 * scale);
+	return pt_chi2(p, shape * 2.0, ln_gamma_shape) * 0.5 * scale;
 }
 #endif

test/include/test/mq.h

@@ -38,11 +38,11 @@ a_attr bool								\
 a_prefix##init(a_mq_type *mq) {						\
 									\
 	if (mtx_init(&mq->lock)) {					\
-		return (true);						\
+		return true;						\
 	}								\
 	ql_new(&mq->msgs);						\
 	mq->count = 0;							\
-	return (false);							\
+	return false;							\
 }									\
 a_attr void								\
 a_prefix##fini(a_mq_type *mq) {						\
@@ -55,7 +55,7 @@ a_prefix##count(a_mq_type *mq) {					\
 	mtx_lock(&mq->lock);						\
 	count = mq->count;						\
 	mtx_unlock(&mq->lock);						\
-	return (count);							\
+	return count;							\
 }									\
 a_attr a_mq_msg_type *							\
 a_prefix##tryget(a_mq_type *mq) {					\
@@ -68,7 +68,7 @@ a_prefix##tryget(a_mq_type *mq) {					\
 		mq->count--;						\
 	}								\
 	mtx_unlock(&mq->lock);						\
-	return (msg);							\
+	return msg;							\
 }									\
 a_attr a_mq_msg_type *							\
 a_prefix##get(a_mq_type *mq) {						\
@@ -77,7 +77,7 @@ a_prefix##get(a_mq_type *mq) {						\
 									\
 	msg = a_prefix##tryget(mq);					\
 	if (msg != NULL) {						\
-		return (msg);						\
+		return msg;						\
 	}								\
 									\
 	ns = 1;								\
@@ -85,7 +85,7 @@ a_prefix##get(a_mq_type *mq) {						\
 		mq_nanosleep(ns);					\
 		msg = a_prefix##tryget(mq);				\
 		if (msg != NULL) {					\
-			return (msg);					\
+			return msg;					\
 		}							\
 		if (ns < 1000*1000*1000) {				\
 			/* Double sleep time, up to max 1 second. */	\

test/integration/MALLOCX_ARENA.c

@@ -41,7 +41,7 @@ thd_start(void *arg) {
 	assert_ptr_not_null(p, "Unexpected mallocx() error");
 	dallocx(p, 0);
 
-	return (NULL);
+	return NULL;
 }
 
 TEST_BEGIN(test_MALLOCX_ARENA) {
@@ -61,6 +61,6 @@ TEST_END
 
 int
 main(void) {
-	return (test(
-	    test_MALLOCX_ARENA));
+	return test(
+	    test_MALLOCX_ARENA);
 }

test/integration/aligned_alloc.c

@@ -126,8 +126,8 @@ TEST_END
 
 int
 main(void) {
-	return (test(
+	return test(
 	    test_alignment_errors,
 	    test_oom_errors,
-	    test_alignment_and_size));
+	    test_alignment_and_size);
 }

test/integration/allocated.c

@@ -91,12 +91,12 @@ thd_start(void *arg) {
 	    "Deallocated memory counter should increase by at least the amount "
 	    "explicitly deallocated");
 
-	return (NULL);
+	return NULL;
 label_ENOENT:
 	assert_false(config_stats,
 	    "ENOENT should only be returned if stats are disabled");
 	test_skip("\"thread.allocated\" mallctl not available");
-	return (NULL);
+	return NULL;
 }
 
 TEST_BEGIN(test_main_thread) {
@@ -115,10 +115,10 @@ TEST_END
 int
 main(void) {
 	/* Run tests multiple times to check for bad interactions. */
-	return (test(
+	return test(
 	    test_main_thread,
 	    test_subthread,
 	    test_main_thread,
 	    test_subthread,
-	    test_main_thread));
+	    test_main_thread);
 }

test/integration/cpp/basic.cpp

@@ -20,6 +20,6 @@ TEST_END
 
 int
 main() {
-	return (test(
-	    test_basic));
+	return test(
+	    test_basic);
 }

test/integration/extent.c

@@ -174,7 +174,7 @@ TEST_END
 
 int
 main(void) {
-	return (test(
+	return test(
 	    test_extent_manual_hook,
-	    test_extent_auto_hook));
+	    test_extent_auto_hook);
 }

test/integration/mallocx.c

@@ -13,12 +13,12 @@ get_nsizes_impl(const char *cmd) {
 	assert_d_eq(mallctl(cmd, (void *)&ret, &z, NULL, 0), 0,
 	    "Unexpected mallctl(\"%s\", ...) failure", cmd);
 
-	return (ret);
+	return ret;
 }
 
 static unsigned
 get_nlarge(void) {
-	return (get_nsizes_impl("arenas.nlextents"));
+	return get_nsizes_impl("arenas.nlextents");
 }
 
 static size_t
@@ -36,12 +36,12 @@ get_size_impl(const char *cmd, size_t ind) {
 	assert_d_eq(mallctlbymib(mib, miblen, (void *)&ret, &z, NULL, 0),
 	    0, "Unexpected mallctlbymib([\"%s\", %zu], ...) failure", cmd, ind);
 
-	return (ret);
+	return ret;
 }
 
 static size_t
 get_large_size(size_t ind) {
-	return (get_size_impl("arenas.lextent.0.size", ind));
+	return get_size_impl("arenas.lextent.0.size", ind);
 }
 
 /*
@@ -216,9 +216,9 @@ TEST_END
 
 int
 main(void) {
-	return (test(
+	return test(
 	    test_overflow,
 	    test_oom,
 	    test_basic,
-	    test_alignment_and_size));
+	    test_alignment_and_size);
 }

test/integration/overflow.c

@@ -41,6 +41,6 @@ TEST_END
 
 int
 main(void) {
-	return (test(
-	    test_overflow));
+	return test(
+	    test_overflow);
 }

test/integration/posix_memalign.c

@@ -120,8 +120,8 @@ TEST_END
 
 int
 main(void) {
-	return (test(
+	return test(
 	    test_alignment_errors,
 	    test_oom_errors,
-	    test_alignment_and_size));
+	    test_alignment_and_size);
 }

test/integration/rallocx.c

@@ -9,12 +9,12 @@ get_nsizes_impl(const char *cmd) {
 	assert_d_eq(mallctl(cmd, (void *)&ret, &z, NULL, 0), 0,
 	    "Unexpected mallctl(\"%s\", ...) failure", cmd);
 
-	return (ret);
+	return ret;
 }
 
 static unsigned
 get_nlarge(void) {
-	return (get_nsizes_impl("arenas.nlextents"));
+	return get_nsizes_impl("arenas.nlextents");
 }
 
 static size_t
@@ -32,12 +32,12 @@ get_size_impl(const char *cmd, size_t ind) {
 	assert_d_eq(mallctlbymib(mib, miblen, (void *)&ret, &z, NULL, 0),
 	    0, "Unexpected mallctlbymib([\"%s\", %zu], ...) failure", cmd, ind);
 
-	return (ret);
+	return ret;
 }
 
 static size_t
 get_large_size(size_t ind) {
-	return (get_size_impl("arenas.lextent.0.size", ind));
+	return get_size_impl("arenas.lextent.0.size", ind);
 }
 
 TEST_BEGIN(test_grow_and_shrink) {
@@ -100,7 +100,7 @@ validate_fill(const void *p, uint8_t c, size_t offset, size_t len) {
 		}
 	}
 
-	return (ret);
+	return ret;
 }
 
 TEST_BEGIN(test_zero) {
@@ -236,10 +236,10 @@ TEST_END
 
 int
 main(void) {
-	return (test(
+	return test(
 	    test_grow_and_shrink,
 	    test_zero,
 	    test_align,
 	    test_lg_align_and_zero,
-	    test_overflow));
+	    test_overflow);
 }

test/integration/sdallocx.c

@@ -49,7 +49,7 @@ TEST_END
 
 int
 main(void) {
-	return (test(
+	return test(
 	    test_basic,
-	    test_alignment_and_size));
+	    test_alignment_and_size);
 }

test/integration/thread_arena.c

@@ -34,7 +34,7 @@ thd_start(void *arg) {
 	assert_u_eq(arena_ind, main_arena_ind,
 	    "Arena index should be same as for main thread");
 
-	return (NULL);
+	return NULL;
 }
 
 TEST_BEGIN(test_thread_arena) {
@@ -72,6 +72,6 @@ TEST_END
 
 int
 main(void) {
-	return (test(
-	    test_thread_arena));
+	return test(
+	    test_thread_arena);
 }

test/integration/thread_tcache_enabled.c

@@ -77,10 +77,10 @@ thd_start(void *arg) {
 	assert_false(e0, "tcache should be disabled");
 
 	free(malloc(1));
-	return (NULL);
+	return NULL;
 label_ENOENT:
 	test_skip("\"thread.tcache.enabled\" mallctl not available");
-	return (NULL);
+	return NULL;
 }
 
 TEST_BEGIN(test_main_thread) {
@@ -99,10 +99,10 @@ TEST_END
 int
 main(void) {
 	/* Run tests multiple times to check for bad interactions. */
-	return (test(
+	return test(
 	    test_main_thread,
 	    test_subthread,
 	    test_main_thread,
 	    test_subthread,
-	    test_main_thread));
+	    test_main_thread);
 }

test/integration/xallocx.c

@@ -19,7 +19,7 @@ arena_ind(void) {
 		    0), 0, "Unexpected mallctl failure creating arena");
 	}
 
-	return (ind);
+	return ind;
 }
 
 TEST_BEGIN(test_same_size) {
@@ -76,17 +76,17 @@ get_nsizes_impl(const char *cmd) {
 	assert_d_eq(mallctl(cmd, (void *)&ret, &z, NULL, 0), 0,
 	    "Unexpected mallctl(\"%s\", ...) failure", cmd);
 
-	return (ret);
+	return ret;
 }
 
 static unsigned
 get_nsmall(void) {
-	return (get_nsizes_impl("arenas.nbins"));
+	return get_nsizes_impl("arenas.nbins");
 }
 
 static unsigned
 get_nlarge(void) {
-	return (get_nsizes_impl("arenas.nlextents"));
+	return get_nsizes_impl("arenas.nlextents");
 }
 
 static size_t
@@ -104,17 +104,17 @@ get_size_impl(const char *cmd, size_t ind) {
 	assert_d_eq(mallctlbymib(mib, miblen, (void *)&ret, &z, NULL, 0),
 	    0, "Unexpected mallctlbymib([\"%s\", %zu], ...) failure", cmd, ind);
 
-	return (ret);
+	return ret;
 }
 
 static size_t
 get_small_size(size_t ind) {
-	return (get_size_impl("arenas.bin.0.size", ind));
+	return get_size_impl("arenas.bin.0.size", ind);
 }
 
 static size_t
 get_large_size(size_t ind) {
-	return (get_size_impl("arenas.lextent.0.size", ind));
+	return get_size_impl("arenas.lextent.0.size", ind);
 }
 
 TEST_BEGIN(test_size) {
@@ -312,7 +312,7 @@ validate_fill(const void *p, uint8_t c, size_t offset, size_t len) {
 		print_filled_extents(p, c, offset + len);
 	}
 
-	return (err);
+	return err;
 }
 
 static void
@@ -376,7 +376,7 @@ TEST_END
 
 int
 main(void) {
-	return (test(
+	return test(
 	    test_same_size,
 	    test_extra_no_move,
 	    test_no_move_fail,
@@ -384,5 +384,5 @@ main(void) {
 	    test_size_extra_overflow,
 	    test_extra_small,
 	    test_extra_large,
-	    test_zero_large));
+	    test_zero_large);
 }

test/src/btalloc.c

@@ -2,5 +2,5 @@
 
 void *
 btalloc(size_t size, unsigned bits) {
-	return (btalloc_0(size, bits));
+	return btalloc_0(size, bits);
 }

test/src/mtx.c

@@ -9,7 +9,7 @@ mtx_init(mtx_t *mtx) {
 #ifdef _WIN32
 	if (!InitializeCriticalSectionAndSpinCount(&mtx->lock,
 	    _CRT_SPINCOUNT)) {
-		return (true);
+		return true;
 	}
 #elif (defined(JEMALLOC_OS_UNFAIR_LOCK))
 	mtx->lock = OS_UNFAIR_LOCK_INIT;
@@ -19,16 +19,16 @@ mtx_init(mtx_t *mtx) {
 	pthread_mutexattr_t attr;
 
 	if (pthread_mutexattr_init(&attr) != 0) {
-		return (true);
+		return true;
 	}
 	pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_DEFAULT);
 	if (pthread_mutex_init(&mtx->lock, &attr) != 0) {
 		pthread_mutexattr_destroy(&attr);
-		return (true);
+		return true;
 	}
 	pthread_mutexattr_destroy(&attr);
 #endif
-	return (false);
+	return false;
 }
 
 void

test/src/test.c

@@ -65,7 +65,7 @@ p_test_impl(bool do_malloc_init, test_t *t, va_list ap) {
 		 */
 		if (nallocx(1, 0) == 0) {
 			malloc_printf("Initialization error");
-			return (test_status_fail);
+			return test_status_fail;
 		}
 	}
 
@@ -85,7 +85,7 @@ p_test_impl(bool do_malloc_init, test_t *t, va_list ap) {
 	    test_status_string(test_status_fail),
 	    test_counts[test_status_fail], test_count);
 
-	return (ret);
+	return ret;
 }
 
 test_status_t
@@ -98,7 +98,7 @@ p_test(test_t *t, ...) {
 	ret = p_test_impl(true, t, ap);
 	va_end(ap);
 
-	return (ret);
+	return ret;
 }
 
 test_status_t
@@ -111,7 +111,7 @@ p_test_no_malloc_init(test_t *t, ...) {
 	ret = p_test_impl(false, t, ap);
 	va_end(ap);
 
-	return (ret);
+	return ret;
 }
 
 void

test/src/timer.c

@@ -18,7 +18,7 @@ timer_usec(const timedelta_t *timer) {
 
 	nstime_copy(&delta, &timer->t1);
 	nstime_subtract(&delta, &timer->t0);
-	return (nstime_ns(&delta) / 1000);
+	return nstime_ns(&delta) / 1000;
 }
 
 void

test/stress/microbench.c

@@ -156,10 +156,10 @@ TEST_END
 
 int
 main(void) {
-	return (test(
+	return test(
 	    test_malloc_vs_mallocx,
 	    test_free_vs_dallocx,
 	    test_dallocx_vs_sdallocx,
 	    test_mus_vs_sallocx,
-	    test_sallocx_vs_nallocx));
+	    test_sallocx_vs_nallocx);
 }

test/unit/SFMT.c

@@ -1591,9 +1591,9 @@ TEST_END
 
 int
 main(void) {
-	return (test(
+	return test(
 	    test_gen_rand_32,
 	    test_by_array_32,
 	    test_gen_rand_64,
-	    test_by_array_64));
+	    test_by_array_64);
 }

test/unit/a0.c

@@ -11,6 +11,6 @@ TEST_END
 
 int
 main(void) {
-	return (test_no_malloc_init(
-	    test_a0));
+	return test_no_malloc_init(
+	    test_a0);
 }

test/unit/arena_reset.c

@@ -13,17 +13,17 @@ get_nsizes_impl(const char *cmd) {
 	assert_d_eq(mallctl(cmd, (void *)&ret, &z, NULL, 0), 0,
 	    "Unexpected mallctl(\"%s\", ...) failure", cmd);
 
-	return (ret);
+	return ret;
 }
 
 static unsigned
 get_nsmall(void) {
-	return (get_nsizes_impl("arenas.nbins"));
+	return get_nsizes_impl("arenas.nbins");
 }
 
 static unsigned
 get_nlarge(void) {
-	return (get_nsizes_impl("arenas.nlextents"));
+	return get_nsizes_impl("arenas.nlextents");
 }
 
 static size_t
@@ -41,17 +41,17 @@ get_size_impl(const char *cmd, size_t ind) {
 	assert_d_eq(mallctlbymib(mib, miblen, (void *)&ret, &z, NULL, 0),
 	    0, "Unexpected mallctlbymib([\"%s\", %zu], ...) failure", cmd, ind);
 
-	return (ret);
+	return ret;
 }
 
 static size_t
 get_small_size(size_t ind) {
-	return (get_size_impl("arenas.bin.0.size", ind));
+	return get_size_impl("arenas.bin.0.size", ind);
 }
 
 static size_t
 get_large_size(size_t ind) {
-	return (get_size_impl("arenas.lextent.0.size", ind));
+	return get_size_impl("arenas.lextent.0.size", ind);
 }
 
 /* Like ivsalloc(), but safe to call on discarded allocations. */
@@ -61,13 +61,13 @@ vsalloc(tsdn_t *tsdn, const void *ptr) {
 
 	extent = extent_lookup(tsdn, ptr, false);
 	if (extent == NULL) {
-		return (0);
+		return 0;
 	}
 	if (!extent_active_get(extent)) {
-		return (0);
+		return 0;
 	}
 
-	return (isalloc(tsdn, extent, ptr));
+	return isalloc(tsdn, extent, ptr);
 }
 
 static unsigned
@@ -77,7 +77,7 @@ do_arena_create(extent_hooks_t *h) {
 	assert_d_eq(mallctl("arenas.create", (void *)&arena_ind, &sz,
 	    (void *)(h != NULL ? &h : NULL), (h != NULL ? sizeof(h) : 0)), 0,
 	    "Unexpected mallctl() failure");
-	return (arena_ind);
+	return arena_ind;
 }
 
 static void
@@ -190,7 +190,7 @@ arena_i_initialized(unsigned arena_ind, bool refresh) {
 	assert_d_eq(mallctlbymib(mib, miblen, (void *)&initialized, &sz, NULL,
 	    0), 0, "Unexpected mallctlbymib() failure");
 
-	return (initialized);
+	return initialized;
 }
 
 TEST_BEGIN(test_arena_destroy_initial) {
@@ -255,11 +255,11 @@ extent_dalloc_unmap(extent_hooks_t *extent_hooks, void *addr, size_t size,
 	    "Wrong hook function");
 	called_dalloc = true;
 	if (!try_dalloc) {
-		return (true);
+		return true;
 	}
 	pages_unmap(addr, size);
 	did_dalloc = true;
-	return (false);
+	return false;
 }
 
 static extent_hooks_t hooks_orig;
@@ -313,9 +313,9 @@ TEST_END
 
 int
 main(void) {
-	return (test(
+	return test(
 	    test_arena_reset,
 	    test_arena_destroy_initial,
 	    test_arena_destroy_hooks_default,
-	    test_arena_destroy_hooks_unmap));
+	    test_arena_destroy_hooks_unmap);
 }

test/unit/atomic.c

@@ -101,10 +101,10 @@ TEST_END
 
 int
 main(void) {
-	return (test(
+	return test(
 	    test_atomic_u64,
 	    test_atomic_u32,
 	    test_atomic_p,
 	    test_atomic_zu,
-	    test_atomic_u));
+	    test_atomic_u);
 }

test/unit/base.c

@@ -212,8 +212,8 @@ TEST_END
 
 int
 main(void) {
-	return (test(
+	return test(
 	    test_base_hooks_default,
 	    test_base_hooks_null,
-	    test_base_hooks_not_null));
+	    test_base_hooks_not_null);
 }

test/unit/bitmap.c

@@ -143,7 +143,7 @@ test_bitmap_size_body(const bitmap_info_t *binfo, size_t nbits,
 	assert_zu_ge(size, (nbits >> 3),
 	    "Bitmap size is smaller than expected");
 	assert_zu_ge(size, prev_size, "Bitmap size is smaller than expected");
-	return (size);
+	return size;
 }
 
 TEST_BEGIN(test_bitmap_size) {
@@ -329,11 +329,11 @@ TEST_END
 
 int
 main(void) {
-	return (test(
+	return test(
 	    test_bitmap_initializer,
 	    test_bitmap_size,
 	    test_bitmap_init,
 	    test_bitmap_set,
 	    test_bitmap_unset,
-	    test_bitmap_sfu));
+	    test_bitmap_sfu);
 }

test/unit/ckh.c

@@ -204,8 +204,8 @@ TEST_END
 
 int
 main(void) {
-	return (test(
+	return test(
 	    test_new_delete,
 	    test_count_insert_search_remove,
-	    test_insert_iter_remove));
+	    test_insert_iter_remove);
 }

test/unit/decay.c

@@ -11,7 +11,7 @@ static bool monotonic_mock;
 
 static bool
 nstime_monotonic_mock(void) {
-	return (monotonic_mock);
+	return monotonic_mock;
 }
 
 static bool
@@ -20,7 +20,7 @@ nstime_update_mock(nstime_t *time) {
 	if (monotonic_mock) {
 		nstime_copy(time, &time_mock);
 	}
-	return (!monotonic_mock);
+	return !monotonic_mock;
 }
 
 TEST_BEGIN(test_decay_ticks) {
@@ -352,8 +352,8 @@ TEST_END
 
 int
 main(void) {
-	return (test(
+	return test(
 	    test_decay_ticks,
 	    test_decay_ticker,
-	    test_decay_nonmonotonic));
+	    test_decay_nonmonotonic);
 }

test/unit/extent_quantize.c

@@ -134,8 +134,8 @@ TEST_END
 
 int
 main(void) {
-	return (test(
+	return test(
 	    test_small_extent_size,
 	    test_large_extent_size,
-	    test_monotonic));
+	    test_monotonic);
 }

test/unit/fork.c

@@ -57,6 +57,6 @@ TEST_END
 
 int
 main(void) {
-	return (test(
-	    test_fork));
+	return test(
+	    test_fork);
 }

test/unit/hash.c

@@ -38,9 +38,9 @@ typedef enum {
 static int
 hash_variant_bits(hash_variant_t variant) {
 	switch (variant) {
-	case hash_variant_x86_32: return (32);
-	case hash_variant_x86_128: return (128);
-	case hash_variant_x64_128: return (128);
+	case hash_variant_x86_32: return 32;
+	case hash_variant_x86_128: return 128;
+	case hash_variant_x64_128: return 128;
 	default: not_reached();
 	}
 }
@@ -48,9 +48,9 @@ hash_variant_bits(hash_variant_t variant) {
 static const char *
 hash_variant_string(hash_variant_t variant) {
 	switch (variant) {
-	case hash_variant_x86_32: return ("hash_x86_32");
-	case hash_variant_x86_128: return ("hash_x86_128");
-	case hash_variant_x64_128: return ("hash_x64_128");
+	case hash_variant_x86_32: return "hash_x86_32";
+	case hash_variant_x86_128: return "hash_x86_128";
+	case hash_variant_x64_128: return "hash_x64_128";
 	default: not_reached();
 	}
 }
@@ -165,8 +165,8 @@ TEST_END
 
 int
 main(void) {
-	return (test(
+	return test(
 	    test_hash_x86_32,
 	    test_hash_x86_128,
-	    test_hash_x64_128));
+	    test_hash_x64_128);
 }

test/unit/junk.c

@@ -138,7 +138,7 @@ TEST_END
 
 int
 main(void) {
-	return (test(
+	return test(
 	    test_junk_small,
-	    test_junk_large));
+	    test_junk_large);
 }

test/unit/mallctl.c

@@ -621,7 +621,7 @@ TEST_END
 
 int
 main(void) {
-	return (test(
+	return test(
 	    test_mallctl_errors,
 	    test_mallctlnametomib_errors,
 	    test_mallctlbymib_errors,
@@ -643,5 +643,5 @@ main(void) {
 	    test_arenas_bin_constants,
 	    test_arenas_lextent_constants,
 	    test_arenas_create,
-	    test_stats_arenas));
+	    test_stats_arenas);
 }

test/unit/math.c

@@ -18,7 +18,7 @@ double_eq_rel(double a, double b, double max_rel_err, double max_abs_err) {
 	double rel_err;
 
 	if (fabs(a - b) < max_abs_err) {
-		return (true);
+		return true;
 	}
 	rel_err = (fabs(b) > fabs(a)) ? fabs((a-b)/b) : fabs((a-b)/a);
 	return (rel_err < max_rel_err);
@@ -33,7 +33,7 @@ factorial(unsigned x) {
 		ret *= (uint64_t)i;
 	}
 
-	return (ret);
+	return ret;
 }
 
 TEST_BEGIN(test_ln_gamma_factorial) {
@@ -380,11 +380,11 @@ TEST_END
 
 int
 main(void) {
-	return (test(
+	return test(
 	    test_ln_gamma_factorial,
 	    test_ln_gamma_misc,
 	    test_pt_norm,
 	    test_pt_chi2,
 	    test_pt_gamma_shape,
-	    test_pt_gamma_scale));
+	    test_pt_gamma_scale);
 }

test/unit/mq.c

@@ -39,7 +39,7 @@ thd_receiver_start(void *arg) {
 		assert_ptr_not_null(msg, "mq_get() should never return NULL");
 		dallocx(msg, 0);
 	}
-	return (NULL);
+	return NULL;
 }
 
 static void *
@@ -55,7 +55,7 @@ thd_sender_start(void *arg) {
 		msg = (mq_msg_t *)p;
 		mq_put(mq, msg);
 	}
-	return (NULL);
+	return NULL;
 }
 
 TEST_BEGIN(test_mq_threaded) {
@@ -82,8 +82,8 @@ TEST_END
 
 int
 main(void) {
-	return (test(
+	return test(
 	    test_mq_basic,
-	    test_mq_threaded));
+	    test_mq_threaded);
 }
 

test/unit/mtx.c

@@ -28,7 +28,7 @@ thd_start(void *varg) {
 		arg->x++;
 		mtx_unlock(&arg->mtx);
 	}
-	return (NULL);
+	return NULL;
 }
 
 TEST_BEGIN(test_mtx_race) {
@@ -51,7 +51,7 @@ TEST_END
 
 int
 main(void) {
-	return (test(
+	return test(
 	    test_mtx_basic,
-	    test_mtx_race));
+	    test_mtx_race);
 }

test/unit/nstime.c

@@ -198,7 +198,7 @@ TEST_END
 
 int
 main(void) {
-	return (test(
+	return test(
 	    test_nstime_init,
 	    test_nstime_init2,
 	    test_nstime_copy,
@@ -209,5 +209,5 @@ main(void) {
 	    test_nstime_idivide,
 	    test_nstime_divide,
 	    test_nstime_monotonic,
-	    test_nstime_update));
+	    test_nstime_update);
 }

test/unit/pack.c

@@ -41,12 +41,12 @@ binind_compute(void) {
 		assert_d_eq(mallctlbymib(mib, miblen, (void *)&size, &sz, NULL,
 		    0), 0, "Unexpected mallctlbymib failure");
 		if (size == SZ) {
-			return (i);
+			return i;
 		}
 	}
 
 	test_fail("Unable to compute nregs_per_run");
-	return (0);
+	return 0;
 }
 
 static size_t
@@ -63,7 +63,7 @@ nregs_per_run_compute(void) {
 	sz = sizeof(nregs);
 	assert_d_eq(mallctlbymib(mib, miblen, (void *)&nregs, &sz, NULL,
 	    0), 0, "Unexpected mallctlbymib failure");
-	return (nregs);
+	return nregs;
 }
 
 static unsigned
@@ -75,7 +75,7 @@ arenas_create_mallctl(void) {
 	assert_d_eq(mallctl("arenas.create", (void *)&arena_ind, &sz, NULL, 0),
 	    0, "Error in arenas.create");
 
-	return (arena_ind);
+	return arena_ind;
 }
 
 static void
@@ -158,6 +158,6 @@ TEST_END
 
 int
 main(void) {
-	return (test(
-	    test_pack));
+	return test(
+	    test_pack);
 }

test/unit/pages.c

@@ -22,6 +22,6 @@ TEST_END
 
 int
 main(void) {
-	return (test(
-	    test_pages_huge));
+	return test(
+	    test_pages_huge);
 }

test/unit/ph.c

@@ -22,7 +22,7 @@ node_cmp(const node_t *a, const node_t *b) {
 		ret = (((uintptr_t)a) > ((uintptr_t)b))
 		    - (((uintptr_t)a) < ((uintptr_t)b));
 	}
-	return (ret);
+	return ret;
 }
 
 static int
@@ -31,7 +31,7 @@ node_cmp_magic(const node_t *a, const node_t *b) {
 	assert_u32_eq(a->magic, NODE_MAGIC, "Bad magic");
 	assert_u32_eq(b->magic, NODE_MAGIC, "Bad magic");
 
-	return (node_cmp(a, b));
+	return node_cmp(a, b);
 }
 
 typedef ph(node_t) heap_t;
@@ -94,7 +94,7 @@ node_validate(const node_t *node, const node_t *parent) {
 
 	leftmost_child = phn_lchild_get(node_t, link, node);
 	if (leftmost_child == NULL) {
-		return (nnodes);
+		return nnodes;
 	}
 	assert_ptr_eq((void *)phn_prev_get(node_t, link, leftmost_child),
 	    (void *)node, "Leftmost child does not link to node");
@@ -107,7 +107,7 @@ node_validate(const node_t *node, const node_t *parent) {
 		    "sibling's prev doesn't link to sibling");
 		nnodes += node_validate(sibling, node);
 	}
-	return (nnodes);
+	return nnodes;
 }
 
 static unsigned
@@ -133,7 +133,7 @@ label_return:
 	if (false) {
 		heap_print(heap);
 	}
-	return (nnodes);
+	return nnodes;
 }
 
 TEST_BEGIN(test_ph_empty) {
@@ -156,7 +156,7 @@ static node_t *
 node_remove_first(heap_t *heap) {
 	node_t *node = heap_remove_first(heap);
 	node->magic = 0;
-	return (node);
+	return node;
 }
 
 TEST_BEGIN(test_ph_random) {
@@ -281,7 +281,7 @@ TEST_END
 
 int
 main(void) {
-	return (test(
+	return test(
 	    test_ph_empty,
-	    test_ph_random));
+	    test_ph_random);
 }

test/unit/prng.c

@@ -221,7 +221,7 @@ TEST_END
 
 int
 main(void) {
-	return (test(
+	return test(
 	    test_prng_lg_range_u32_nonatomic,
 	    test_prng_lg_range_u32_atomic,
 	    test_prng_lg_range_u64_nonatomic,
@@ -231,5 +231,5 @@ main(void) {
 	    test_prng_range_u32_atomic,
 	    test_prng_range_u64_nonatomic,
 	    test_prng_range_zu_nonatomic,
-	    test_prng_range_zu_atomic));
+	    test_prng_range_zu_atomic);
 }

test/unit/prof_accum.c

@@ -17,12 +17,12 @@ prof_dump_open_intercept(bool propagate_err, const char *filename) {
 	fd = open("/dev/null", O_WRONLY);
 	assert_d_ne(fd, -1, "Unexpected open() failure");
 
-	return (fd);
+	return fd;
 }
 
 static void *
 alloc_from_permuted_backtrace(unsigned thd_ind, unsigned iteration) {
-	return (btalloc(1, thd_ind*NALLOCS_PER_THREAD + iteration));
+	return btalloc(1, thd_ind*NALLOCS_PER_THREAD + iteration);
 }
 
 static void *
@@ -51,7 +51,7 @@ thd_start(void *varg) {
 		}
 	}
 
-	return (NULL);
+	return NULL;
 }
 
 TEST_BEGIN(test_idump) {
@@ -81,6 +81,6 @@ TEST_END
 
 int
 main(void) {
-	return (test(
-	    test_idump));
+	return test(
+	    test_idump);
 }

test/unit/prof_active.c

@@ -117,6 +117,6 @@ TEST_END
 
 int
 main(void) {
-	return (test(
-	    test_prof_active));
+	return test(
+	    test_prof_active);
 }

test/unit/prof_gdump.c

@@ -15,7 +15,7 @@ prof_dump_open_intercept(bool propagate_err, const char *filename) {
 	fd = open("/dev/null", O_WRONLY);
 	assert_d_ne(fd, -1, "Unexpected open() failure");
 
-	return (fd);
+	return fd;
 }
 
 TEST_BEGIN(test_gdump) {
@@ -73,6 +73,6 @@ TEST_END
 
 int
 main(void) {
-	return (test(
-	    test_gdump));
+	return test(
+	    test_gdump);
 }

test/unit/prof_idump.c

@@ -24,7 +24,7 @@ prof_dump_open_intercept(bool propagate_err, const char *filename) {
 	fd = open("/dev/null", O_WRONLY);
 	assert_d_ne(fd, -1, "Unexpected open() failure");
 
-	return (fd);
+	return fd;
 }
 
 TEST_BEGIN(test_idump) {
@@ -50,6 +50,6 @@ TEST_END
 
 int
 main(void) {
-	return (test(
-	    test_idump));
+	return test(
+	    test_idump);
 }

test/unit/prof_reset.c

@@ -12,7 +12,7 @@ prof_dump_open_intercept(bool propagate_err, const char *filename) {
 	fd = open("/dev/null", O_WRONLY);
 	assert_d_ne(fd, -1, "Unexpected open() failure");
 
-	return (fd);
+	return fd;
 }
 
 static void
@@ -29,7 +29,7 @@ get_lg_prof_sample(void) {
 	assert_d_eq(mallctl("prof.lg_sample", (void *)&lg_prof_sample, &sz,
 	    NULL, 0), 0,
 	    "Unexpected mallctl failure while reading profiling sample rate");
-	return (lg_prof_sample);
+	return lg_prof_sample;
 }
 
 static void
@@ -94,7 +94,7 @@ prof_dump_header_intercept(tsdn_t *tsdn, bool propagate_err,
 	prof_dump_header_intercepted = true;
 	memcpy(&cnt_all_copy, cnt_all, sizeof(prof_cnt_t));
 
-	return (false);
+	return false;
 }
 
 TEST_BEGIN(test_prof_reset_cleanup) {
@@ -181,7 +181,7 @@ thd_start(void *varg) {
 		}
 	}
 
-	return (NULL);
+	return NULL;
 }
 
 TEST_BEGIN(test_prof_reset) {
@@ -283,9 +283,9 @@ main(void) {
 	/* Intercept dumping prior to running any tests. */
 	prof_dump_open = prof_dump_open_intercept;
 
-	return (test(
+	return test(
 	    test_prof_reset_basic,
 	    test_prof_reset_cleanup,
 	    test_prof_reset,
-	    test_xallocx));
+	    test_xallocx);
 }

test/unit/prof_thread_name.c

@@ -94,7 +94,7 @@ thd_start(void *varg) {
 	mallctl_thread_name_set(thread_name);
 	mallctl_thread_name_set("");
 
-	return (NULL);
+	return NULL;
 }
 
 TEST_BEGIN(test_prof_thread_name_threaded) {
@@ -118,7 +118,7 @@ TEST_END
 
 int
 main(void) {
-	return (test(
+	return test(
 	    test_prof_thread_name_validation,
-	    test_prof_thread_name_threaded));
+	    test_prof_thread_name_threaded);
 }

test/unit/ql.c

@@ -192,11 +192,11 @@ TEST_END
 
 int
 main(void) {
-	return (test(
+	return test(
 	    test_ql_empty,
 	    test_ql_tail_insert,
 	    test_ql_tail_remove,
 	    test_ql_head_insert,
 	    test_ql_head_remove,
-	    test_ql_insert));
+	    test_ql_insert);
 }

test/unit/qr.c

@@ -232,10 +232,10 @@ TEST_END
 
 int
 main(void) {
-	return (test(
+	return test(
 	    test_qr_one,
 	    test_qr_after_insert,
 	    test_qr_remove,
 	    test_qr_before_insert,
-	    test_qr_meld_split));
+	    test_qr_meld_split);
 }

test/unit/rb.c

@@ -36,7 +36,7 @@ node_cmp(const node_t *a, const node_t *b) {
 		ret = (((uintptr_t)a) > ((uintptr_t)b))
 		    - (((uintptr_t)a) < ((uintptr_t)b));
 	}
-	return (ret);
+	return ret;
 }
 
 typedef rb_tree(node_t) tree_t;
@@ -73,7 +73,7 @@ tree_recurse(node_t *node, unsigned black_height, unsigned black_depth) {
 	node_t *right_node;
 
 	if (node == NULL) {
-		return (ret);
+		return ret;
 	}
 
 	left_node = rbtn_left_get(node_t, link, node);
@@ -112,7 +112,7 @@ tree_recurse(node_t *node, unsigned black_height, unsigned black_depth) {
 		ret += (black_depth != black_height);
 	}
 
-	return (ret);
+	return ret;
 }
 
 static node_t *
@@ -139,7 +139,7 @@ tree_iterate_cb(tree_t *tree, node_t *node, void *data) {
 
 	(*i)++;
 
-	return (NULL);
+	return NULL;
 }
 
 static unsigned
@@ -149,7 +149,7 @@ tree_iterate(tree_t *tree) {
 	i = 0;
 	tree_iter(tree, NULL, tree_iterate_cb, (void *)&i);
 
-	return (i);
+	return i;
 }
 
 static unsigned
@@ -159,7 +159,7 @@ tree_iterate_reverse(tree_t *tree) {
 	i = 0;
 	tree_reverse_iter(tree, NULL, tree_iterate_cb, (void *)&i);
 
-	return (i);
+	return i;
 }
 
 static void
@@ -201,7 +201,7 @@ remove_iterate_cb(tree_t *tree, node_t *node, void *data) {
 
 	node_remove(tree, node, *nnodes);
 
-	return (ret);
+	return ret;
 }
 
 static node_t *
@@ -211,7 +211,7 @@ remove_reverse_iterate_cb(tree_t *tree, node_t *node, void *data) {
 
 	node_remove(tree, node, *nnodes);
 
-	return (ret);
+	return ret;
 }
 
 static void
@@ -347,7 +347,7 @@ TEST_END
 
 int
 main(void) {
-	return (test(
+	return test(
 	    test_rb_empty,
-	    test_rb_random));
+	    test_rb_random);
 }

test/unit/rtree.c

@@ -18,7 +18,7 @@ rtree_node_alloc_intercept(tsdn_t *tsdn, rtree_t *rtree, size_t nelms) {
 	assert_ptr_not_null(node, "Unexpected calloc() failure");
 	malloc_mutex_lock(tsdn, &rtree->init_lock);
 
-	return (node);
+	return node;
 }
 
 static void
@@ -102,7 +102,7 @@ thd_start(void *varg) {
 
 	free(extent);
 	fini_gen_rand(sfmt);
-	return (NULL);
+	return NULL;
 }
 
 TEST_BEGIN(test_rtree_concurrent) {
@@ -283,10 +283,10 @@ main(void) {
 	rtree_node_dalloc = rtree_node_dalloc_intercept;
 	test_rtree = NULL;
 
-	return (test(
+	return test(
 	    test_rtree_read_empty,
 	    test_rtree_concurrent,
 	    test_rtree_extrema,
 	    test_rtree_bits,
-	    test_rtree_random));
+	    test_rtree_random);
 }

test/unit/size_classes.c

@@ -19,7 +19,7 @@ get_max_size_class(void) {
 	assert_d_eq(mallctlbymib(mib, miblen, (void *)&max_size_class, &sz,
 	    NULL, 0), 0, "Unexpected mallctlbymib() error");
 
-	return (max_size_class);
+	return max_size_class;
 }
 
 TEST_BEGIN(test_size_classes) {
@@ -173,8 +173,8 @@ TEST_END
 
 int
 main(void) {
-	return (test(
+	return test(
 	    test_size_classes,
 	    test_psize_classes,
-	    test_overflow));
+	    test_overflow);
 }

test/unit/slab.c

@@ -27,6 +27,6 @@ TEST_END
 
 int
 main(void) {
-	return (test(
-	    test_arena_slab_regind));
+	return test(
+	    test_arena_slab_regind);
 }

test/unit/smoothstep.c

@@ -95,8 +95,8 @@ TEST_END
 
 int
 main(void) {
-	return (test(
+	return test(
 	    test_smoothstep_integral,
 	    test_smoothstep_monotonic,
-	    test_smoothstep_slope));
+	    test_smoothstep_slope);
 }

test/unit/stats.c

@@ -116,7 +116,7 @@ TEST_END
 
 void *
 thd_start(void *arg) {
-	return (NULL);
+	return NULL;
 }
 
 static void
@@ -339,12 +339,12 @@ TEST_END
 
 int
 main(void) {
-	return (test(
+	return test(
 	    test_stats_summary,
 	    test_stats_large,
 	    test_stats_arenas_summary,
 	    test_stats_arenas_small,
 	    test_stats_arenas_large,
 	    test_stats_arenas_bins,
-	    test_stats_arenas_lextents));
+	    test_stats_arenas_lextents);
 }

test/unit/stats_print.c

@@ -983,7 +983,7 @@ TEST_END
 
 int
 main(void) {
-	return (test(
+	return test(
 	    test_json_parser,
-	    test_stats_print_json));
+	    test_stats_print_json);
 }

test/unit/ticker.c

@@ -64,8 +64,8 @@ TEST_END
 
 int
 main(void) {
-	return (test(
+	return test(
 	    test_ticker_tick,
 	    test_ticker_ticks,
-	    test_ticker_copy));
+	    test_ticker_copy);
 }

test/unit/tsd.c

@@ -71,7 +71,7 @@ thd_start(void *arg) {
 	    "Resetting local data should have no effect on tsd");
 
 	free(p);
-	return (NULL);
+	return NULL;
 }
 
 TEST_BEGIN(test_tsd_main_thread) {
@@ -95,11 +95,11 @@ main(void) {
 	/* Core tsd bootstrapping must happen prior to data_tsd_boot(). */
 	if (nallocx(1, 0) == 0) {
 		malloc_printf("Initialization error");
-		return (test_status_fail);
+		return test_status_fail;
 	}
 	data_tsd_boot();
 
-	return (test(
+	return test(
 	    test_tsd_main_thread,
-	    test_tsd_sub_thread));
+	    test_tsd_sub_thread);
 }

test/unit/util.c

@@ -296,12 +296,12 @@ TEST_END
 
 int
 main(void) {
-	return (test(
+	return test(
 	    test_pow2_ceil_u64,
 	    test_pow2_ceil_u32,
 	    test_pow2_ceil_zu,
 	    test_malloc_strtoumax_no_endptr,
 	    test_malloc_strtoumax,
 	    test_malloc_snprintf_truncated,
-	    test_malloc_snprintf));
+	    test_malloc_snprintf);
 }

test/unit/witness.c

@@ -38,7 +38,7 @@ witness_comp(const witness_t *a, void *oa, const witness_t *b, void *ob) {
 	assert(oa == (void *)a);
 	assert(ob == (void *)b);
 
-	return (strcmp(a->name, b->name));
+	return strcmp(a->name, b->name);
 }
 
 static int
@@ -49,7 +49,7 @@ witness_comp_reverse(const witness_t *a, void *oa, const witness_t *b,
 	assert(oa == (void *)a);
 	assert(ob == (void *)b);
 
-	return (-strcmp(a->name, b->name));
+	return -strcmp(a->name, b->name);
 }
 
 TEST_BEGIN(test_witness) {
@@ -255,11 +255,11 @@ TEST_END
 
 int
 main(void) {
-	return (test(
+	return test(
 	    test_witness,
 	    test_witness_comp,
 	    test_witness_reversal,
 	    test_witness_recursive,
 	    test_witness_unlock_not_owned,
-	    test_witness_lockful));
+	    test_witness_lockful);
 }

test/unit/zero.c

@@ -58,7 +58,7 @@ TEST_END
 
 int
 main(void) {
-	return (test(
+	return test(
 	    test_zero_small,
-	    test_zero_large));
+	    test_zero_large);
 }