Skip to content

Commit

Permalink
Fix test-strchr.c warnings for wide string testing.
Browse files Browse the repository at this point in the history
string/test-strchr.c is used for both wide and narrow string testing,
but produces a series of warnings for wide string testing because of
hardcoded use of narrow characters in the function check1.  This patch
fixes that function to use macros abstracting away the wide / narrow
string choice, adding a new such macro to handle the string and
character constants.

Tested for x86_64.

	* string/test-strchr.c [!WIDE] (L): New macro.
	[WIDE] (L): Likewise.
	(check1): Use CHAR instead of char.  Use L on string and character
	constants.
  • Loading branch information
Joseph Myers committed Nov 26, 2014
1 parent 704f794 commit 3b20fd5
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 3 deletions.
7 changes: 7 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
2014-11-26 Joseph Myers <joseph@codesourcery.com>

* string/test-strchr.c [!WIDE] (L): New macro.
[WIDE] (L): Likewise.
(check1): Use CHAR instead of char. Use L on string and character
constants.

2014-11-26 Adhemerval Zanella <azanella@linux.ibm.com>

* csu/tst-atomic.c (do_test): Add atomic_exchange_and_add_{acq,rel}
Expand Down
8 changes: 5 additions & 3 deletions string/test-strchr.c
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
# define MIDDLE_CHAR 127
# define SMALL_CHAR 23
# define UCHAR unsigned char
# define L(s) s
#else
# include <wchar.h>
# define STRCHR wcschr
Expand All @@ -53,6 +54,7 @@
# define MIDDLE_CHAR 1121
# define SMALL_CHAR 851
# define UCHAR wchar_t
# define L(s) L ## s
#endif

#ifdef USE_FOR_STRCHRNUL
Expand Down Expand Up @@ -219,9 +221,9 @@ do_random_tests (void)
static void
check1 (void)
{
char s[] __attribute__((aligned(16))) = "\xff";
char c = '\xfe';
char *exp_result = stupid_STRCHR (s, c);
CHAR s[] __attribute__((aligned(16))) = L ("\xff");
CHAR c = L ('\xfe');
CHAR *exp_result = stupid_STRCHR (s, c);

FOR_EACH_IMPL (impl, 0)
check_result (impl, s, c, exp_result);
Expand Down

0 comments on commit 3b20fd5

Please sign in to comment.