Mercurial > gnulib

changeset 30610:ff132ea00ac6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Avoid compiler warnings on Cygwin.
author Bruno Haible <bruno@clisp.org>
date Sat, 20 Dec 2008 14:31:30 +0100
parents ae579a7f1815
children d8905f0d8d12
files tests/test-mbrtowc.c tests/test-mbsrtowcs.c
diffstat 2 files changed, 38 insertions(+), 38 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-mbrtowc.c	Sat Dec 20 13:43:27 2008 +0100
+++ b/tests/test-mbrtowc.c	Sat Dec 20 14:31:30 2008 +0100
@@ -51,7 +51,7 @@
   /* Test zero-length input.  */
   {
     memset (&state, '\0', sizeof (mbstate_t));
-    wc = 0xBADFACE;
+    wc = (wchar_t) 0xBADFACE;
     ret = mbrtowc (&wc, "x", 0, &state);
     /* gnulib's implementation returns (size_t)(-2).
        The AIX 5.1 implementation returns (size_t)(-1).
@@ -63,7 +63,7 @@
   /* Test NUL byte input.  */
   {
     memset (&state, '\0', sizeof (mbstate_t));
-    wc = 0xBADFACE;
+    wc = (wchar_t) 0xBADFACE;
     ret = mbrtowc (&wc, "", 1, &state);
     ASSERT (ret == 0);
     ASSERT (wc == 0);
@@ -105,7 +105,7 @@
 	case 'z': case '{': case '|': case '}': case '~':
 	  /* c is in the ISO C "basic character set".  */
 	  buf[0] = c;
-	  wc = 0xBADFACE;
+	  wc = (wchar_t) 0xBADFACE;
 	  ret = mbrtowc (&wc, buf, 1, &state);
 	  ASSERT (ret == 1);
 	  ASSERT (wc == c);
@@ -120,7 +120,7 @@
   /* Test special calling convention, passing a NULL pointer.  */
   {
     memset (&state, '\0', sizeof (mbstate_t));
-    wc = 0xBADFACE;
+    wc = (wchar_t) 0xBADFACE;
     ret = mbrtowc (&wc, NULL, 5, &state);
     ASSERT (ret == 0);
     ASSERT (wc == (wchar_t) 0xBADFACE);
@@ -136,35 +136,35 @@
 	  char input[] = "B\374\337er"; /* "Büßer" */
 	  memset (&state, '\0', sizeof (mbstate_t));
 
-	  wc = 0xBADFACE;
+	  wc = (wchar_t) 0xBADFACE;
 	  ret = mbrtowc (&wc, input, 1, &state);
 	  ASSERT (ret == 1);
 	  ASSERT (wc == 'B');
 	  ASSERT (mbsinit (&state));
 	  input[0] = '\0';
 
-	  wc = 0xBADFACE;
+	  wc = (wchar_t) 0xBADFACE;
 	  ret = mbrtowc (&wc, input + 1, 1, &state);
 	  ASSERT (ret == 1);
 	  ASSERT (wctob (wc) == (unsigned char) '\374');
 	  ASSERT (mbsinit (&state));
 	  input[1] = '\0';
 
-	  wc = 0xBADFACE;
+	  wc = (wchar_t) 0xBADFACE;
 	  ret = mbrtowc (&wc, input + 2, 3, &state);
 	  ASSERT (ret == 1);
 	  ASSERT (wctob (wc) == (unsigned char) '\337');
 	  ASSERT (mbsinit (&state));
 	  input[2] = '\0';
 
-	  wc = 0xBADFACE;
+	  wc = (wchar_t) 0xBADFACE;
 	  ret = mbrtowc (&wc, input + 3, 2, &state);
 	  ASSERT (ret == 1);
 	  ASSERT (wc == 'e');
 	  ASSERT (mbsinit (&state));
 	  input[3] = '\0';
 
-	  wc = 0xBADFACE;
+	  wc = (wchar_t) 0xBADFACE;
 	  ret = mbrtowc (&wc, input + 4, 1, &state);
 	  ASSERT (ret == 1);
 	  ASSERT (wc == 'r');
@@ -178,28 +178,28 @@
 	  char input[] = "B\303\274\303\237er"; /* "Büßer" */
 	  memset (&state, '\0', sizeof (mbstate_t));
 
-	  wc = 0xBADFACE;
+	  wc = (wchar_t) 0xBADFACE;
 	  ret = mbrtowc (&wc, input, 1, &state);
 	  ASSERT (ret == 1);
 	  ASSERT (wc == 'B');
 	  ASSERT (mbsinit (&state));
 	  input[0] = '\0';
 
-	  wc = 0xBADFACE;
+	  wc = (wchar_t) 0xBADFACE;
 	  ret = mbrtowc (&wc, input + 1, 1, &state);
 	  ASSERT (ret == (size_t)(-2));
 	  ASSERT (wc == (wchar_t) 0xBADFACE);
 	  ASSERT (!mbsinit (&state));
 	  input[1] = '\0';
 
-	  wc = 0xBADFACE;
+	  wc = (wchar_t) 0xBADFACE;
 	  ret = mbrtowc (&wc, input + 2, 5, &state);
 	  ASSERT (ret == 1);
 	  ASSERT (wctob (wc) == EOF);
 	  ASSERT (mbsinit (&state));
 	  input[2] = '\0';
 
-	  wc = 0xBADFACE;
+	  wc = (wchar_t) 0xBADFACE;
 	  ret = mbrtowc (&wc, input + 3, 4, &state);
 	  ASSERT (ret == 2);
 	  ASSERT (wctob (wc) == EOF);
@@ -207,14 +207,14 @@
 	  input[3] = '\0';
 	  input[4] = '\0';
 
-	  wc = 0xBADFACE;
+	  wc = (wchar_t) 0xBADFACE;
 	  ret = mbrtowc (&wc, input + 5, 2, &state);
 	  ASSERT (ret == 1);
 	  ASSERT (wc == 'e');
 	  ASSERT (mbsinit (&state));
 	  input[5] = '\0';
 
-	  wc = 0xBADFACE;
+	  wc = (wchar_t) 0xBADFACE;
 	  ret = mbrtowc (&wc, input + 6, 1, &state);
 	  ASSERT (ret == 1);
 	  ASSERT (wc == 'r');
@@ -228,21 +228,21 @@
 	  char input[] = "B\217\253\344\217\251\316er"; /* "Büßer" */
 	  memset (&state, '\0', sizeof (mbstate_t));
 
-	  wc = 0xBADFACE;
+	  wc = (wchar_t) 0xBADFACE;
 	  ret = mbrtowc (&wc, input, 1, &state);
 	  ASSERT (ret == 1);
 	  ASSERT (wc == 'B');
 	  ASSERT (mbsinit (&state));
 	  input[0] = '\0';
 
-	  wc = 0xBADFACE;
+	  wc = (wchar_t) 0xBADFACE;
 	  ret = mbrtowc (&wc, input + 1, 1, &state);
 	  ASSERT (ret == (size_t)(-2));
 	  ASSERT (wc == (wchar_t) 0xBADFACE);
 	  ASSERT (!mbsinit (&state));
 	  input[1] = '\0';
 
-	  wc = 0xBADFACE;
+	  wc = (wchar_t) 0xBADFACE;
 	  ret = mbrtowc (&wc, input + 2, 7, &state);
 	  ASSERT (ret == 2);
 	  ASSERT (wctob (wc) == EOF);
@@ -250,7 +250,7 @@
 	  input[2] = '\0';
 	  input[3] = '\0';
 
-	  wc = 0xBADFACE;
+	  wc = (wchar_t) 0xBADFACE;
 	  ret = mbrtowc (&wc, input + 4, 5, &state);
 	  ASSERT (ret == 3);
 	  ASSERT (wctob (wc) == EOF);
@@ -259,14 +259,14 @@
 	  input[5] = '\0';
 	  input[6] = '\0';
 
-	  wc = 0xBADFACE;
+	  wc = (wchar_t) 0xBADFACE;
 	  ret = mbrtowc (&wc, input + 7, 2, &state);
 	  ASSERT (ret == 1);
 	  ASSERT (wc == 'e');
 	  ASSERT (mbsinit (&state));
 	  input[5] = '\0';
 
-	  wc = 0xBADFACE;
+	  wc = (wchar_t) 0xBADFACE;
 	  ret = mbrtowc (&wc, input + 8, 1, &state);
 	  ASSERT (ret == 1);
 	  ASSERT (wc == 'r');
@@ -280,28 +280,28 @@
 	  char input[] = "B\250\271\201\060\211\070er"; /* "Büßer" */
 	  memset (&state, '\0', sizeof (mbstate_t));
 
-	  wc = 0xBADFACE;
+	  wc = (wchar_t) 0xBADFACE;
 	  ret = mbrtowc (&wc, input, 1, &state);
 	  ASSERT (ret == 1);
 	  ASSERT (wc == 'B');
 	  ASSERT (mbsinit (&state));
 	  input[0] = '\0';
 
-	  wc = 0xBADFACE;
+	  wc = (wchar_t) 0xBADFACE;
 	  ret = mbrtowc (&wc, input + 1, 1, &state);
 	  ASSERT (ret == (size_t)(-2));
 	  ASSERT (wc == (wchar_t) 0xBADFACE);
 	  ASSERT (!mbsinit (&state));
 	  input[1] = '\0';
 
-	  wc = 0xBADFACE;
+	  wc = (wchar_t) 0xBADFACE;
 	  ret = mbrtowc (&wc, input + 2, 7, &state);
 	  ASSERT (ret == 1);
 	  ASSERT (wctob (wc) == EOF);
 	  ASSERT (mbsinit (&state));
 	  input[2] = '\0';
 
-	  wc = 0xBADFACE;
+	  wc = (wchar_t) 0xBADFACE;
 	  ret = mbrtowc (&wc, input + 3, 6, &state);
 	  ASSERT (ret == 4);
 	  ASSERT (wctob (wc) == EOF);
@@ -311,14 +311,14 @@
 	  input[5] = '\0';
 	  input[6] = '\0';
 
-	  wc = 0xBADFACE;
+	  wc = (wchar_t) 0xBADFACE;
 	  ret = mbrtowc (&wc, input + 7, 2, &state);
 	  ASSERT (ret == 1);
 	  ASSERT (wc == 'e');
 	  ASSERT (mbsinit (&state));
 	  input[5] = '\0';
 
-	  wc = 0xBADFACE;
+	  wc = (wchar_t) 0xBADFACE;
 	  ret = mbrtowc (&wc, input + 8, 1, &state);
 	  ASSERT (ret == 1);
 	  ASSERT (wc == 'r');
--- a/tests/test-mbsrtowcs.c	Sat Dec 20 13:43:27 2008 +0100
+++ b/tests/test-mbsrtowcs.c	Sat Dec 20 14:31:30 2008 +0100
@@ -64,14 +64,14 @@
     ASSERT (ret == 0);
     ASSERT (mbsinit (&state));
 
-    wc = 0xBADFACE;
+    wc = (wchar_t) 0xBADFACE;
     src = "";
     ret = mbsrtowcs (&wc, &src, 0, &state);
     ASSERT (ret == 0);
     ASSERT (wc == (wchar_t) 0xBADFACE);
     ASSERT (mbsinit (&state));
 
-    wc = 0xBADFACE;
+    wc = (wchar_t) 0xBADFACE;
     src = "";
     ret = mbsrtowcs (&wc, &src, 1, &state);
     ASSERT (ret == 0);
@@ -92,7 +92,7 @@
 	  {
 	    size_t i;
 	    for (i = 0; i < BUFSIZE; i++)
-	      buf[i] = 0xBADFACE;
+	      buf[i] = (wchar_t) 0xBADFACE;
 	  }
 
 	  switch (argv[1][0])
@@ -103,14 +103,14 @@
 		char input[] = "B\374\337er"; /* "Büßer" */
 		memset (&state, '\0', sizeof (mbstate_t));
 
-		wc = 0xBADFACE;
+		wc = (wchar_t) 0xBADFACE;
 		ret = mbrtowc (&wc, input, 1, &state);
 		ASSERT (ret == 1);
 		ASSERT (wc == 'B');
 		ASSERT (mbsinit (&state));
 		input[0] = '\0';
 
-		wc = 0xBADFACE;
+		wc = (wchar_t) 0xBADFACE;
 		ret = mbrtowc (&wc, input + 1, 1, &state);
 		ASSERT (ret == 1);
 		ASSERT (wctob (wc) == (unsigned char) '\374');
@@ -147,14 +147,14 @@
 		char input[] = "B\303\274\303\237er"; /* "Büßer" */
 		memset (&state, '\0', sizeof (mbstate_t));
 
-		wc = 0xBADFACE;
+		wc = (wchar_t) 0xBADFACE;
 		ret = mbrtowc (&wc, input, 1, &state);
 		ASSERT (ret == 1);
 		ASSERT (wc == 'B');
 		ASSERT (mbsinit (&state));
 		input[0] = '\0';
 
-		wc = 0xBADFACE;
+		wc = (wchar_t) 0xBADFACE;
 		ret = mbrtowc (&wc, input + 1, 1, &state);
 		ASSERT (ret == (size_t)(-2));
 		ASSERT (wc == (wchar_t) 0xBADFACE);
@@ -192,14 +192,14 @@
 		char input[] = "B\217\253\344\217\251\316er"; /* "Büßer" */
 		memset (&state, '\0', sizeof (mbstate_t));
 
-		wc = 0xBADFACE;
+		wc = (wchar_t) 0xBADFACE;
 		ret = mbrtowc (&wc, input, 1, &state);
 		ASSERT (ret == 1);
 		ASSERT (wc == 'B');
 		ASSERT (mbsinit (&state));
 		input[0] = '\0';
 
-		wc = 0xBADFACE;
+		wc = (wchar_t) 0xBADFACE;
 		ret = mbrtowc (&wc, input + 1, 1, &state);
 		ASSERT (ret == (size_t)(-2));
 		ASSERT (wc == (wchar_t) 0xBADFACE);
@@ -237,14 +237,14 @@
 		char input[] = "B\250\271\201\060\211\070er"; /* "Büßer" */
 		memset (&state, '\0', sizeof (mbstate_t));
 
-		wc = 0xBADFACE;
+		wc = (wchar_t) 0xBADFACE;
 		ret = mbrtowc (&wc, input, 1, &state);
 		ASSERT (ret == 1);
 		ASSERT (wc == 'B');
 		ASSERT (mbsinit (&state));
 		input[0] = '\0';
 
-		wc = 0xBADFACE;
+		wc = (wchar_t) 0xBADFACE;
 		ret = mbrtowc (&wc, input + 1, 1, &state);
 		ASSERT (ret == (size_t)(-2));
 		ASSERT (wc == (wchar_t) 0xBADFACE);