From 90d3320d7f57fae3d2f89d907e8307b6a76d133d Mon Sep 17 00:00:00 2001 From: Wilco Dijkstra Date: Fri, 21 Dec 2018 18:52:40 +0000 Subject: Refactor string benchtests Refactor string benchtests by moving duplicated defines into bench-string.h. * benchtests/bench-memchr.c: Cleanup defines. * benchtests/bench-memcmp.c: Likewise. * benchtests/bench-memset.c: Likewise. * benchtests/bench-memset-large.c: Likewise. * benchtests/bench-memset-walk.c: Likewise. * benchtests/bench-stpcpy.c: Likewise. * benchtests/bench-stpncpy.c: Likewise. * benchtests/bench-strcat.c: Likewise. * benchtests/bench-strchr.c: Likewise. * benchtests/bench-strcmp.c: Likewise. * benchtests/bench-strcpy.c: Likewise. * benchtests/bench-strcspn.c: Likewise. * benchtests/bench-string.h: Likewise. * benchtests/bench-strlen.c: Likewise. * benchtests/bench-strncat.c: Likewise. * benchtests/bench-strncmp.c: Likewise. * benchtests/bench-strncpy.c: Likewise. * benchtests/bench-strnlen.c: Likewise. * benchtests/bench-strpbrk.c: Likewise. * benchtests/bench-strrchr.c: Likewise. * benchtests/bench-strspn.c: Likewise. --- benchtests/bench-strchr.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) (limited to 'benchtests/bench-strchr.c') diff --git a/benchtests/bench-strchr.c b/benchtests/bench-strchr.c index 56d58fcd51..a773069989 100644 --- a/benchtests/bench-strchr.c +++ b/benchtests/bench-strchr.c @@ -32,35 +32,26 @@ #endif /* WIDE */ #include "bench-string.h" +#define BIG_CHAR MAX_CHAR + #ifndef WIDE # ifdef USE_FOR_STRCHRNUL +# undef STRCHR # define STRCHR strchrnul # define stupid_STRCHR stupid_STRCHRNUL # define simple_STRCHR simple_STRCHRNUL -# else -# define STRCHR strchr # endif /* !USE_FOR_STRCHRNUL */ -# define STRLEN strlen -# define CHAR char -# define BIG_CHAR CHAR_MAX # define MIDDLE_CHAR 127 # define SMALL_CHAR 23 -# define UCHAR unsigned char #else -# include # ifdef USE_FOR_STRCHRNUL +# undef STRCHR # define STRCHR wcschrnul # define stupid_STRCHR stupid_WCSCHRNUL # define simple_STRCHR simple_WCSCHRNUL -# else -# define STRCHR wcschr # endif /* !USE_FOR_STRCHRNUL */ -# define STRLEN wcslen -# define CHAR wchar_t -# define BIG_CHAR WCHAR_MAX # define MIDDLE_CHAR 1121 # define SMALL_CHAR 851 -# define UCHAR wchar_t #endif /* WIDE */ #ifdef USE_FOR_STRCHRNUL -- cgit 1.4.1