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

@@ -10,8 +10,7 @@ const char *malloc_conf = "junk:false";
* xallocx() would ordinarily be able to extend.
*/
static unsigned
arena_ind(void)
{
arena_ind(void) {
static unsigned ind = 0;
if (ind == 0) {
@@ -23,8 +22,7 @@ arena_ind(void)
return (ind);
}
TEST_BEGIN(test_same_size)
{
TEST_BEGIN(test_same_size) {
void *p;
size_t sz, tsz;
@@ -39,8 +37,7 @@ TEST_BEGIN(test_same_size)
}
TEST_END
TEST_BEGIN(test_extra_no_move)
{
TEST_BEGIN(test_extra_no_move) {
void *p;
size_t sz, tsz;
@@ -55,8 +52,7 @@ TEST_BEGIN(test_extra_no_move)
}
TEST_END
TEST_BEGIN(test_no_move_fail)
{
TEST_BEGIN(test_no_move_fail) {
void *p;
size_t sz, tsz;
@@ -72,8 +68,7 @@ TEST_BEGIN(test_no_move_fail)
TEST_END
static unsigned
get_nsizes_impl(const char *cmd)
{
get_nsizes_impl(const char *cmd) {
unsigned ret;
size_t z;
@@ -85,20 +80,17 @@ get_nsizes_impl(const char *cmd)
}
static unsigned
get_nsmall(void)
{
get_nsmall(void) {
return (get_nsizes_impl("arenas.nbins"));
}
static unsigned
get_nlarge(void)
{
get_nlarge(void) {
return (get_nsizes_impl("arenas.nlextents"));
}
static size_t
get_size_impl(const char *cmd, size_t ind)
{
get_size_impl(const char *cmd, size_t ind) {
size_t ret;
size_t z;
size_t mib[4];
@@ -116,19 +108,16 @@ get_size_impl(const char *cmd, size_t ind)
}
static size_t
get_small_size(size_t ind)
{
get_small_size(size_t ind) {
return (get_size_impl("arenas.bin.0.size", ind));
}
static size_t
get_large_size(size_t ind)
{
get_large_size(size_t ind) {
return (get_size_impl("arenas.lextent.0.size", ind));
}
TEST_BEGIN(test_size)
{
TEST_BEGIN(test_size) {
size_t small0, largemax;
void *p;
@@ -157,8 +146,7 @@ TEST_BEGIN(test_size)
}
TEST_END
TEST_BEGIN(test_size_extra_overflow)
{
TEST_BEGIN(test_size_extra_overflow) {
size_t small0, largemax;
void *p;
@@ -189,8 +177,7 @@ TEST_BEGIN(test_size_extra_overflow)
}
TEST_END
TEST_BEGIN(test_extra_small)
{
TEST_BEGIN(test_extra_small) {
size_t small0, small1, largemax;
void *p;
@@ -221,8 +208,7 @@ TEST_BEGIN(test_extra_small)
}
TEST_END
TEST_BEGIN(test_extra_large)
{
TEST_BEGIN(test_extra_large) {
int flags = MALLOCX_ARENA(arena_ind());
size_t smallmax, large1, large2, large3, largemax;
void *p;
@@ -292,8 +278,7 @@ TEST_BEGIN(test_extra_large)
TEST_END
static void
print_filled_extents(const void *p, uint8_t c, size_t len)
{
print_filled_extents(const void *p, uint8_t c, size_t len) {
const uint8_t *pc = (const uint8_t *)p;
size_t i, range0;
uint8_t c0;
@@ -312,26 +297,26 @@ print_filled_extents(const void *p, uint8_t c, size_t len)
}
static bool
validate_fill(const void *p, uint8_t c, size_t offset, size_t len)
{
validate_fill(const void *p, uint8_t c, size_t offset, size_t len) {
const uint8_t *pc = (const uint8_t *)p;
bool err;
size_t i;
for (i = offset, err = false; i < offset+len; i++) {
if (pc[i] != c)
if (pc[i] != c) {
err = true;
}
}
if (err)
if (err) {
print_filled_extents(p, c, offset + len);
}
return (err);
}
static void
test_zero(size_t szmin, size_t szmax)
{
test_zero(size_t szmin, size_t szmax) {
int flags = MALLOCX_ARENA(arena_ind()) | MALLOCX_ZERO;
size_t sz, nsz;
void *p;
@@ -378,8 +363,7 @@ test_zero(size_t szmin, size_t szmax)
dallocx(p, flags);
}
TEST_BEGIN(test_zero_large)
{
TEST_BEGIN(test_zero_large) {
size_t large0, large1;
/* Get size classes. */
@@ -391,8 +375,7 @@ TEST_BEGIN(test_zero_large)
TEST_END
int
main(void)
{
main(void) {
return (test(
test_same_size,
test_extra_no_move,