Update brace style.

Add braces around single-line blocks, and remove line breaks before
function-opening braces.

This resolves #537.
This commit is contained in:
Jason Evans
2017-01-15 16:56:30 -08:00
parent 5154ff32ee
commit c4c2592c83
119 changed files with 2971 additions and 3572 deletions

View File

@@ -1,7 +1,6 @@
#include "test/jemalloc_test.h"
TEST_BEGIN(test_mallctl_errors)
{
TEST_BEGIN(test_mallctl_errors) {
uint64_t epoch;
size_t sz;
@@ -28,8 +27,7 @@ TEST_BEGIN(test_mallctl_errors)
}
TEST_END
TEST_BEGIN(test_mallctlnametomib_errors)
{
TEST_BEGIN(test_mallctlnametomib_errors) {
size_t mib[1];
size_t miblen;
@@ -39,8 +37,7 @@ TEST_BEGIN(test_mallctlnametomib_errors)
}
TEST_END
TEST_BEGIN(test_mallctlbymib_errors)
{
TEST_BEGIN(test_mallctlbymib_errors) {
uint64_t epoch;
size_t sz;
size_t mib[1];
@@ -76,8 +73,7 @@ TEST_BEGIN(test_mallctlbymib_errors)
}
TEST_END
TEST_BEGIN(test_mallctl_read_write)
{
TEST_BEGIN(test_mallctl_read_write) {
uint64_t old_epoch, new_epoch;
size_t sz = sizeof(old_epoch);
@@ -104,8 +100,7 @@ TEST_BEGIN(test_mallctl_read_write)
}
TEST_END
TEST_BEGIN(test_mallctlnametomib_short_mib)
{
TEST_BEGIN(test_mallctlnametomib_short_mib) {
size_t mib[4];
size_t miblen;
@@ -119,8 +114,7 @@ TEST_BEGIN(test_mallctlnametomib_short_mib)
}
TEST_END
TEST_BEGIN(test_mallctl_config)
{
TEST_BEGIN(test_mallctl_config) {
#define TEST_MALLCTL_CONFIG(config, t) do { \
t oldval; \
size_t sz = sizeof(oldval); \
@@ -149,8 +143,7 @@ TEST_BEGIN(test_mallctl_config)
}
TEST_END
TEST_BEGIN(test_mallctl_opt)
{
TEST_BEGIN(test_mallctl_opt) {
bool config_always = true;
#define TEST_MALLCTL_OPT(t, opt, config) do { \
@@ -189,8 +182,7 @@ TEST_BEGIN(test_mallctl_opt)
}
TEST_END
TEST_BEGIN(test_manpage_example)
{
TEST_BEGIN(test_manpage_example) {
unsigned nbins, i;
size_t mib[4];
size_t len, miblen;
@@ -214,8 +206,7 @@ TEST_BEGIN(test_manpage_example)
}
TEST_END
TEST_BEGIN(test_tcache_none)
{
TEST_BEGIN(test_tcache_none) {
void *p0, *q, *p1;
test_skip_if(!config_tcache);
@@ -240,8 +231,7 @@ TEST_BEGIN(test_tcache_none)
}
TEST_END
TEST_BEGIN(test_tcache)
{
TEST_BEGIN(test_tcache) {
#define NTCACHES 10
unsigned tis[NTCACHES];
void *ps[NTCACHES];
@@ -312,11 +302,13 @@ TEST_BEGIN(test_tcache)
assert_ptr_eq(qs[i], q0,
"Expected rallocx() to allocate cached region, i=%u", i);
/* Avoid undefined behavior in case of test failure. */
if (qs[i] == NULL)
if (qs[i] == NULL) {
qs[i] = ps[i];
}
}
for (i = 0; i < NTCACHES; i++)
for (i = 0; i < NTCACHES; i++) {
dallocx(qs[i], MALLOCX_TCACHE(tis[i]));
}
/* Flush some non-empty tcaches. */
for (i = 0; i < NTCACHES/2; i++) {
@@ -334,8 +326,7 @@ TEST_BEGIN(test_tcache)
}
TEST_END
TEST_BEGIN(test_thread_arena)
{
TEST_BEGIN(test_thread_arena) {
unsigned arena_old, arena_new, narenas;
size_t sz = sizeof(unsigned);
@@ -353,8 +344,7 @@ TEST_BEGIN(test_thread_arena)
}
TEST_END
TEST_BEGIN(test_arena_i_initialized)
{
TEST_BEGIN(test_arena_i_initialized) {
unsigned narenas, i;
size_t sz;
size_t mib[3];
@@ -392,8 +382,7 @@ TEST_BEGIN(test_arena_i_initialized)
}
TEST_END
TEST_BEGIN(test_arena_i_decay_time)
{
TEST_BEGIN(test_arena_i_decay_time) {
ssize_t decay_time, orig_decay_time, prev_decay_time;
size_t sz = sizeof(ssize_t);
@@ -423,8 +412,7 @@ TEST_BEGIN(test_arena_i_decay_time)
}
TEST_END
TEST_BEGIN(test_arena_i_purge)
{
TEST_BEGIN(test_arena_i_purge) {
unsigned narenas;
size_t sz = sizeof(unsigned);
size_t mib[3];
@@ -447,8 +435,7 @@ TEST_BEGIN(test_arena_i_purge)
}
TEST_END
TEST_BEGIN(test_arena_i_decay)
{
TEST_BEGIN(test_arena_i_decay) {
unsigned narenas;
size_t sz = sizeof(unsigned);
size_t mib[3];
@@ -471,8 +458,7 @@ TEST_BEGIN(test_arena_i_decay)
}
TEST_END
TEST_BEGIN(test_arena_i_dss)
{
TEST_BEGIN(test_arena_i_dss) {
const char *dss_prec_old, *dss_prec_new;
size_t sz = sizeof(dss_prec_old);
size_t mib[3];
@@ -517,8 +503,7 @@ TEST_BEGIN(test_arena_i_dss)
}
TEST_END
TEST_BEGIN(test_arenas_decay_time)
{
TEST_BEGIN(test_arenas_decay_time) {
ssize_t decay_time, orig_decay_time, prev_decay_time;
size_t sz = sizeof(ssize_t);
@@ -548,8 +533,7 @@ TEST_BEGIN(test_arenas_decay_time)
}
TEST_END
TEST_BEGIN(test_arenas_constants)
{
TEST_BEGIN(test_arenas_constants) {
#define TEST_ARENAS_CONSTANT(t, name, expected) do { \
t name; \
size_t sz = sizeof(t); \
@@ -567,8 +551,7 @@ TEST_BEGIN(test_arenas_constants)
}
TEST_END
TEST_BEGIN(test_arenas_bin_constants)
{
TEST_BEGIN(test_arenas_bin_constants) {
#define TEST_ARENAS_BIN_CONSTANT(t, name, expected) do { \
t name; \
size_t sz = sizeof(t); \
@@ -586,8 +569,7 @@ TEST_BEGIN(test_arenas_bin_constants)
}
TEST_END
TEST_BEGIN(test_arenas_lextent_constants)
{
TEST_BEGIN(test_arenas_lextent_constants) {
#define TEST_ARENAS_LEXTENT_CONSTANT(t, name, expected) do { \
t name; \
size_t sz = sizeof(t); \
@@ -602,8 +584,7 @@ TEST_BEGIN(test_arenas_lextent_constants)
}
TEST_END
TEST_BEGIN(test_arenas_create)
{
TEST_BEGIN(test_arenas_create) {
unsigned narenas_before, arena, narenas_after;
size_t sz = sizeof(unsigned);
@@ -620,8 +601,7 @@ TEST_BEGIN(test_arenas_create)
}
TEST_END
TEST_BEGIN(test_stats_arenas)
{
TEST_BEGIN(test_stats_arenas) {
#define TEST_STATS_ARENAS(t, name) do { \
t name; \
size_t sz = sizeof(t); \
@@ -640,8 +620,7 @@ TEST_BEGIN(test_stats_arenas)
TEST_END
int
main(void)
{
main(void) {
return (test(
test_mallctl_errors,
test_mallctlnametomib_errors,