From 0b7d1aeb9db4ac6791a030d2bb841d8ea9c665e5 Mon Sep 17 00:00:00 2001 From: Szabolcs Nagy Date: Tue, 12 May 2020 16:40:08 +0100 Subject: string: format tests according to GNU style Use the GNU style consistently in the string test code. Added clang-format guard comments where necessary so the code can be reformated using the clang-format tool and GNU style settings from gcc contrib/clang-format. --- string/test/memset.c | 148 ++++++++++++++++++++++++++++----------------------- 1 file changed, 82 insertions(+), 66 deletions(-) (limited to 'string/test/memset.c') diff --git a/string/test/memset.c b/string/test/memset.c index 8b05bd6..4ac5ba1 100644 --- a/string/test/memset.c +++ b/string/test/memset.c @@ -12,95 +12,111 @@ #include "stringlib.h" #include "stringtest.h" +#define F(x) {#x, x}, + static const struct fun { - const char *name; - void *(*fun)(void *s, int c, size_t n); + const char *name; + void *(*fun) (void *s, int c, size_t n); } funtab[] = { -#define F(x) {#x, x}, -F(memset) + // clang-format off + F(memset) #if __aarch64__ -F(__memset_aarch64) + F(__memset_aarch64) #elif __arm__ -F(__memset_arm) + F(__memset_arm) #endif -#undef F - {0, 0} + {0, 0} + // clang-format on }; +#undef F #define A 32 #define LEN 250000 -static unsigned char sbuf[LEN+2*A]; +static unsigned char sbuf[LEN + 2 * A]; -static void *alignup(void *p) +static void * +alignup (void *p) { - return (void*)(((uintptr_t)p + A-1) & -A); + return (void *) (((uintptr_t) p + A - 1) & -A); } -static void test(const struct fun *fun, int salign, int c, int len) +static void +test (const struct fun *fun, int salign, int c, int len) { - unsigned char *src = alignup(sbuf); - unsigned char *s = src + salign; - void *p; - int i; + unsigned char *src = alignup (sbuf); + unsigned char *s = src + salign; + void *p; + int i; - if (err_count >= ERR_LIMIT) - return; - if (len > LEN || salign >= A) - abort(); - for (i = 0; i < len+A; i++) - src[i] = '?'; - for (i = 0; i < len; i++) - s[i] = 'a' + i%23; + if (err_count >= ERR_LIMIT) + return; + if (len > LEN || salign >= A) + abort (); + for (i = 0; i < len + A; i++) + src[i] = '?'; + for (i = 0; i < len; i++) + s[i] = 'a' + i % 23; - p = fun->fun(s, c, len); - if (p != s) - ERR("%s(%p,..) returned %p\n", fun->name, s, p); + p = fun->fun (s, c, len); + if (p != s) + ERR ("%s(%p,..) returned %p\n", fun->name, s, p); - for (i = 0; i < salign; i++) { - if (src[i] != '?') { - ERR("%s(align %d, %d, %d) failed\n", fun->name, salign, c, len); - quoteat("got", src, len+A, i); - return; - } + for (i = 0; i < salign; i++) + { + if (src[i] != '?') + { + ERR ("%s(align %d, %d, %d) failed\n", fun->name, salign, c, len); + quoteat ("got", src, len + A, i); + return; } - for (; i < salign+len; i++) { - if (src[i] != (unsigned char)c) { - ERR("%s(align %d, %d, %d) failed\n", fun->name, salign, c, len); - quoteat("got", src, len+A, i); - return; - } + } + for (; i < salign + len; i++) + { + if (src[i] != (unsigned char) c) + { + ERR ("%s(align %d, %d, %d) failed\n", fun->name, salign, c, len); + quoteat ("got", src, len + A, i); + return; } - for (; i < len+A; i++) { - if (src[i] != '?') { - ERR("%s(align %d, %d, %d) failed\n", fun->name, salign, c, len); - quoteat("got", src, len+A, i); - return; - } + } + for (; i < len + A; i++) + { + if (src[i] != '?') + { + ERR ("%s(align %d, %d, %d) failed\n", fun->name, salign, c, len); + quoteat ("got", src, len + A, i); + return; } + } } -int main() +int +main () { - int r = 0; - for (int i=0; funtab[i].name; i++) { - err_count = 0; - for (int s = 0; s < A; s++) { - int n; - for (n = 0; n < 100; n++) { - test(funtab+i, s, 0, n); - test(funtab+i, s, 0x25, n); - test(funtab+i, s, 0xaa25, n); - } - for (; n < LEN; n *= 2) { - test(funtab+i, s, 0, n); - test(funtab+i, s, 0x25, n); - test(funtab+i, s, 0xaa25, n); - } - } - printf("%s %s\n", err_count ? "FAIL" : "PASS", funtab[i].name); - if (err_count) - r = -1; + int r = 0; + for (int i = 0; funtab[i].name; i++) + { + err_count = 0; + for (int s = 0; s < A; s++) + { + int n; + for (n = 0; n < 100; n++) + { + test (funtab + i, s, 0, n); + test (funtab + i, s, 0x25, n); + test (funtab + i, s, 0xaa25, n); + } + for (; n < LEN; n *= 2) + { + test (funtab + i, s, 0, n); + test (funtab + i, s, 0x25, n); + test (funtab + i, s, 0xaa25, n); + } } - return r; + printf ("%s %s\n", err_count ? "FAIL" : "PASS", funtab[i].name); + if (err_count) + r = -1; + } + return r; } -- cgit v1.2.3