Define {FROM,TO}_LOOP_{MIN,MAX}_NEEDED_{FROM,TO} instead of
authordrepper <drepper>
Wed, 15 May 2002 05:33:36 +0000 (05:33 +0000)
committerdrepper <drepper>
Wed, 15 May 2002 05:33:36 +0000 (05:33 +0000)
{MIN,MAX}_NEEDED_{FROM,TO}. Set FROM_LOOP_MAX_NEEDED_TO to 8, not 4.

iconvdata/euc-jisx0213.c
iconvdata/shift_jisx0213.c

index a0062c8..f3f48a5 100644 (file)
 #define TO_LOOP                        to_euc_jisx0213
 #define DEFINE_INIT            1
 #define DEFINE_FINI            1
 #define TO_LOOP                        to_euc_jisx0213
 #define DEFINE_INIT            1
 #define DEFINE_FINI            1
-#define MIN_NEEDED_FROM                1
-#define MAX_NEEDED_FROM                3
-#define MIN_NEEDED_TO          4
+#define FROM_LOOP_MIN_NEEDED_FROM      1
+#define FROM_LOOP_MAX_NEEDED_FROM      3
+#define FROM_LOOP_MIN_NEEDED_TO                4
+#define FROM_LOOP_MAX_NEEDED_TO                8
+#define TO_LOOP_MIN_NEEDED_FROM                4
+#define TO_LOOP_MAX_NEEDED_FROM                4
+#define TO_LOOP_MIN_NEEDED_TO          1
+#define TO_LOOP_MAX_NEEDED_TO          3
 #define PREPARE_LOOP \
   int saved_state;                                                           \
   int *statep = &data->__statep->__count;
 #define PREPARE_LOOP \
   int saved_state;                                                           \
   int *statep = &data->__statep->__count;
 
 
 /* First define the conversion function from EUC-JISX0213 to UCS-4.  */
 
 
 /* First define the conversion function from EUC-JISX0213 to UCS-4.  */
-#define MIN_NEEDED_INPUT       MIN_NEEDED_FROM
-#define MAX_NEEDED_INPUT       MAX_NEEDED_FROM
-#define MIN_NEEDED_OUTPUT      MIN_NEEDED_TO
+#define MIN_NEEDED_INPUT       FROM_LOOP_MIN_NEEDED_FROM
+#define MAX_NEEDED_INPUT       FROM_LOOP_MAX_NEEDED_FROM
+#define MIN_NEEDED_OUTPUT      FROM_LOOP_MIN_NEEDED_TO
+#define MAX_NEEDED_OUTPUT      FROM_LOOP_MAX_NEEDED_TO
 #define LOOPFCT                        FROM_LOOP
 #define BODY \
   {                                                                          \
 #define LOOPFCT                        FROM_LOOP
 #define BODY \
   {                                                                          \
@@ -288,9 +294,10 @@ static const struct
   { 0xa6f5, 0xa6f8 }, /* 0x12678 = 0x12675 U+309A */
 };
 
   { 0xa6f5, 0xa6f8 }, /* 0x12678 = 0x12675 U+309A */
 };
 
-#define MIN_NEEDED_INPUT       MIN_NEEDED_TO
-#define MIN_NEEDED_OUTPUT      MIN_NEEDED_FROM
-#define MAX_NEEDED_OUTPUT      MAX_NEEDED_FROM
+#define MIN_NEEDED_INPUT       TO_LOOP_MIN_NEEDED_FROM
+#define MAX_NEEDED_INPUT       TO_LOOP_MAX_NEEDED_FROM
+#define MIN_NEEDED_OUTPUT      TO_LOOP_MIN_NEEDED_TO
+#define MAX_NEEDED_OUTPUT      TO_LOOP_MAX_NEEDED_TO
 #define LOOPFCT                        TO_LOOP
 #define BODY \
   {                                                                          \
 #define LOOPFCT                        TO_LOOP
 #define BODY \
   {                                                                          \
index ec79200..3a62724 100644 (file)
 #define TO_LOOP                        to_shift_jisx0213
 #define DEFINE_INIT            1
 #define DEFINE_FINI            1
 #define TO_LOOP                        to_shift_jisx0213
 #define DEFINE_INIT            1
 #define DEFINE_FINI            1
-#define MIN_NEEDED_FROM                1
-#define MAX_NEEDED_FROM                2
-#define MIN_NEEDED_TO          4
+#define FROM_LOOP_MIN_NEEDED_FROM      1
+#define FROM_LOOP_MAX_NEEDED_FROM      2
+#define FROM_LOOP_MIN_NEEDED_TO                4
+#define FROM_LOOP_MAX_NEEDED_TO                8
+#define TO_LOOP_MIN_NEEDED_FROM                4
+#define TO_LOOP_MAX_NEEDED_FROM                4
+#define TO_LOOP_MIN_NEEDED_TO          1
+#define TO_LOOP_MAX_NEEDED_TO          2
 #define PREPARE_LOOP \
   int saved_state;                                                           \
   int *statep = &data->__statep->__count;
 #define PREPARE_LOOP \
   int saved_state;                                                           \
   int *statep = &data->__statep->__count;
 
 
 /* First define the conversion function from Shift_JISX0213 to UCS-4.  */
 
 
 /* First define the conversion function from Shift_JISX0213 to UCS-4.  */
-#define MIN_NEEDED_INPUT       MIN_NEEDED_FROM
-#define MAX_NEEDED_INPUT       MAX_NEEDED_FROM
-#define MIN_NEEDED_OUTPUT      MIN_NEEDED_TO
+#define MIN_NEEDED_INPUT       FROM_LOOP_MIN_NEEDED_FROM
+#define MAX_NEEDED_INPUT       FROM_LOOP_MAX_NEEDED_FROM
+#define MIN_NEEDED_OUTPUT      FROM_LOOP_MIN_NEEDED_TO
+#define MAX_NEEDED_OUTPUT      FROM_LOOP_MAX_NEEDED_TO
 #define LOOPFCT                        FROM_LOOP
 #define BODY \
   {                                                                          \
 #define LOOPFCT                        FROM_LOOP
 #define BODY \
   {                                                                          \
@@ -277,9 +283,10 @@ static const struct
   { 0x83f3, 0x83f6 }, /* 0x12678 = 0x12675 U+309A */
 };
 
   { 0x83f3, 0x83f6 }, /* 0x12678 = 0x12675 U+309A */
 };
 
-#define MIN_NEEDED_INPUT       MIN_NEEDED_TO
-#define MIN_NEEDED_OUTPUT      MIN_NEEDED_FROM
-#define MAX_NEEDED_OUTPUT      MAX_NEEDED_FROM
+#define MIN_NEEDED_INPUT       TO_LOOP_MIN_NEEDED_FROM
+#define MAX_NEEDED_INPUT       TO_LOOP_MAX_NEEDED_FROM
+#define MIN_NEEDED_OUTPUT      TO_LOOP_MIN_NEEDED_TO
+#define MAX_NEEDED_OUTPUT      TO_LOOP_MAX_NEEDED_TO
 #define LOOPFCT                        TO_LOOP
 #define BODY \
   {                                                                          \
 #define LOOPFCT                        TO_LOOP
 #define BODY \
   {                                                                          \