X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=tests%2Ftest-mbrtowc.c;h=8f1f1bec83122077e2366d94cf805b6cb3fdbbe7;hb=1e89e00e39b24bd6471d43ca1230ab2c42acc45a;hp=4bff83f59501a2a80229f3c8eb3312bc959d3ae1;hpb=dca7c61846780f4af95c531cd069b002cb31c0a5;p=gnulib.git

diff --git a/tests/test-mbrtowc.c b/tests/test-mbrtowc.c
index 4bff83f59..8f1f1bec8 100644
--- a/tests/test-mbrtowc.c
+++ b/tests/test-mbrtowc.c
@@ -51,16 +51,19 @@ main (int argc, char *argv[])
   /* Test zero-length input.  */
   {
     memset (&state, '\0', sizeof (mbstate_t));
-    wc = 0xBADFACE;
+    wc = (wchar_t) 0xBADFACE;
     ret = mbrtowc (&wc, "x", 0, &state);
-    ASSERT (ret == (size_t)(-2) || ret == 0);
+    /* gnulib's implementation returns (size_t)(-2).
+       The AIX 5.1 implementation returns (size_t)(-1).
+       glibc's implementation returns 0.  */
+    ASSERT (ret == (size_t)(-2) || ret == (size_t)(-1) || ret == 0);
     ASSERT (mbsinit (&state));
   }
 
   /* 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);
@@ -102,7 +105,7 @@ main (int argc, char *argv[])
 	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);
@@ -117,7 +120,7 @@ main (int argc, char *argv[])
   /* 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);
@@ -133,35 +136,35 @@ main (int argc, char *argv[])
 	  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');
@@ -175,28 +178,28 @@ main (int argc, char *argv[])
 	  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);
@@ -204,14 +207,14 @@ main (int argc, char *argv[])
 	  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');
@@ -222,51 +225,50 @@ main (int argc, char *argv[])
       case '3':
 	/* Locale encoding is EUC-JP.  */
 	{
-	  char input[] = "B\217\253\344\217\251\316er"; /* "Büßer" */
+	  char input[] = "<\306\374\313\334\270\354>"; /* "<日本語>" */
 	  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 (wc == '<');
 	  ASSERT (mbsinit (&state));
 	  input[0] = '\0';
 
-	  wc = 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;
-	  ret = mbrtowc (&wc, input + 2, 7, &state);
+	  wc = (wchar_t) 0xBADFACE;
+	  ret = mbrtowc (&wc, input + 1, 2, &state);
 	  ASSERT (ret == 2);
 	  ASSERT (wctob (wc) == EOF);
 	  ASSERT (mbsinit (&state));
+	  input[1] = '\0';
 	  input[2] = '\0';
+
+	  wc = (wchar_t) 0xBADFACE;
+	  ret = mbrtowc (&wc, input + 3, 1, &state);
+	  ASSERT (ret == (size_t)(-2));
+	  ASSERT (wc == (wchar_t) 0xBADFACE);
+	  ASSERT (!mbsinit (&state));
 	  input[3] = '\0';
 
-	  wc = 0xBADFACE;
-	  ret = mbrtowc (&wc, input + 4, 5, &state);
-	  ASSERT (ret == 3);
+	  wc = (wchar_t) 0xBADFACE;
+	  ret = mbrtowc (&wc, input + 4, 4, &state);
+	  ASSERT (ret == 1);
 	  ASSERT (wctob (wc) == EOF);
 	  ASSERT (mbsinit (&state));
 	  input[4] = '\0';
-	  input[5] = '\0';
-	  input[6] = '\0';
 
-	  wc = 0xBADFACE;
-	  ret = mbrtowc (&wc, input + 7, 2, &state);
-	  ASSERT (ret == 1);
-	  ASSERT (wc == 'e');
+	  wc = (wchar_t) 0xBADFACE;
+	  ret = mbrtowc (&wc, input + 5, 3, &state);
+	  ASSERT (ret == 2);
+	  ASSERT (wctob (wc) == EOF);
 	  ASSERT (mbsinit (&state));
 	  input[5] = '\0';
+	  input[6] = '\0';
 
-	  wc = 0xBADFACE;
-	  ret = mbrtowc (&wc, input + 8, 1, &state);
+	  wc = (wchar_t) 0xBADFACE;
+	  ret = mbrtowc (&wc, input + 7, 1, &state);
 	  ASSERT (ret == 1);
-	  ASSERT (wc == 'r');
+	  ASSERT (wc == '>');
 	  ASSERT (mbsinit (&state));
 	}
 	return 0;
@@ -277,28 +279,28 @@ main (int argc, char *argv[])
 	  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);
@@ -308,14 +310,14 @@ main (int argc, char *argv[])
 	  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');