From: Ulrich Drepper <drepper@redhat.com>
Date: Sun, 7 May 2000 22:00:43 +0000 (+0000)
Subject: Update.
X-Git-Tag: upstream/2.30~25663
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1336419e465c180c938652fadc2aa0b487a6e887;p=external%2Fglibc.git

Update.

	* iconv/gconv_simple.c (internal_ucs4_loop): Prefer reporting
	empty input buffer over full output buffer.
---

diff --git a/ChangeLog b/ChangeLog
index bc6ec3f..4557c9f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
 
 	* iconv/Makefile (tests): Add tst-iconv1.
 	* iconv/tst-iconv1.c: New file.
+	* iconv/gconv_simple.c (internal_ucs4_loop): Prefer reporting
+	empty input buffer over full output buffer.
 	Reported by yaoz@nih.gov.
 
 2000-05-06  Bruno Haible  <haible@clisp.cons.org>
diff --git a/iconv/gconv_simple.c b/iconv/gconv_simple.c
index 1844f2b..caee6f3 100644
--- a/iconv/gconv_simple.c
+++ b/iconv/gconv_simple.c
@@ -89,10 +89,10 @@ internal_ucs4_loop (const unsigned char **inptrp, const unsigned char *inend,
 #endif
 
   /* Determine the status.  */
-  if (*outptrp == outend)
-    result = __GCONV_FULL_OUTPUT;
-  else if (*inptrp == inend)
+  if (*inptrp == inend)
     result = __GCONV_EMPTY_INPUT;
+  else if (*outptrp == outend)
+    result = __GCONV_FULL_OUTPUT;
   else
     result = __GCONV_INCOMPLETE_INPUT;