summary refs log tree commit diff
path: root/iconvdata
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-09-25 05:12:05 +0000
committerUlrich Drepper <drepper@redhat.com>2000-09-25 05:12:05 +0000
commit655de5fdf21929f7f11d2307b13aeb66a1b47181 (patch)
tree8deedccf086bd131de3bbc17f663dd8c9eac0a16 /iconvdata
parentd90e1b429546fc546e624769b213a0620de36951 (diff)
downloadglibc-655de5fdf21929f7f11d2307b13aeb66a1b47181.tar.gz
glibc-655de5fdf21929f7f11d2307b13aeb66a1b47181.tar.xz
glibc-655de5fdf21929f7f11d2307b13aeb66a1b47181.zip
Update.
2000-09-24  Ulrich Drepper  <drepper@redhat.com>

	* libio/genops.c (_IO_doallocbuf): Don't use single byte buffer if
	stream is in wide mode.

	* stdio-common/vfprintf.c (buffered_vfprintf): Orient stream.

2000-09-21  Bruno Haible  <haible@clisp.cons.org>

	* iconvdata/iso-2022-cn-ext.c (EMIT_SHIFT_TO_INIT): Shift __count
	by 3, not 2.
	(INIT_PARAMS, UPDATE_PARAMS): Likewise.

	handling.
	* stdio/tst-printf.sh: Adjust expected results.
	Reported by Joseph S. Myers <jsm28@cam.ac.uk>.
Diffstat (limited to 'iconvdata')
-rw-r--r--iconvdata/iso-2022-cn-ext.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/iconvdata/iso-2022-cn-ext.c b/iconvdata/iso-2022-cn-ext.c
index 32a639a0c5..20f889ee9d 100644
--- a/iconvdata/iso-2022-cn-ext.c
+++ b/iconvdata/iso-2022-cn-ext.c
@@ -123,12 +123,12 @@ enum
    the output state to the initial state.  This has to be done during the
    flushing.  */
 #define EMIT_SHIFT_TO_INIT \
-  if (data->__statep->__count >> 2 != ASCII_set)			      \
+  if (data->__statep->__count >> 3 != ASCII_set)			      \
     {									      \
       if (FROM_DIRECTION)						      \
 	/* It's easy, we don't have to emit anything, we just reset the	      \
 	   state for the input.  */					      \
-	data->__statep->__count = ASCII_set << 2;			      \
+	data->__statep->__count = ASCII_set << 3;			      \
       else								      \
 	{								      \
 	  unsigned char *outbuf = data->__outbuf;			      \
@@ -145,7 +145,7 @@ enum
 	      if (data->__flags & __GCONV_IS_LAST)			      \
 		*irreversible += 1;					      \
 	      data->__outbuf = outbuf;					      \
-	      data->__statep->__count = ASCII_set << 2;			      \
+	      data->__statep->__count = ASCII_set << 3;			      \
 	    }								      \
 	}								      \
     }
@@ -394,9 +394,9 @@ enum
     *((uint32_t *) outptr)++ = ch;					      \
   }
 #define EXTRA_LOOP_DECLS	, int *setp
-#define INIT_PARAMS		int set = (*setp >> 2) & CURRENT_MASK; \
-				int ann = (*setp >> 2) & ~CURRENT_MASK
-#define UPDATE_PARAMS		*setp = (set | ann) << 2
+#define INIT_PARAMS		int set = (*setp >> 3) & CURRENT_MASK; \
+				int ann = (*setp >> 3) & ~CURRENT_MASK
+#define UPDATE_PARAMS		*setp = (set | ann) << 3
 #define LOOP_NEED_FLAGS
 #include <iconv/loop.c>
 
@@ -644,9 +644,9 @@ enum
     inptr += 4;								      \
   }
 #define EXTRA_LOOP_DECLS	, int *setp
-#define INIT_PARAMS		int set = (*setp >> 2) & CURRENT_MASK; \
-				int ann = (*setp >> 2) & ~CURRENT_MASK
-#define UPDATE_PARAMS		*setp = (set | ann) << 2
+#define INIT_PARAMS		int set = (*setp >> 3) & CURRENT_MASK; \
+				int ann = (*setp >> 3) & ~CURRENT_MASK
+#define UPDATE_PARAMS		*setp = (set | ann) << 3
 #define LOOP_NEED_FLAGS
 #include <iconv/loop.c>