[KoCo-CVS] [Commit] cjkcodecs/src _hz.c

[Hye-Shik C. <pe...@us...>]

perky       03/07/09 14:00:48

  Modified:    src      _hz.c
  Log:
  Fix hz codec's bug that doesn't initialize the encoding mode to
  ASCII.
  
  Revision  Changes    Path
  1.3       +44 -24    cjkcodecs/src/_hz.c
  
  Index: _hz.c
  ===================================================================
  RCS file: /cvsroot/koco/cjkcodecs/src/_hz.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- _hz.c	31 May 2003 11:50:19 -0000	1.2
  +++ _hz.c	9 Jul 2003 21:00:48 -0000	1.3
  @@ -26,7 +26,7 @@
    * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
    * POSSIBILITY OF SUCH DAMAGE.
    *
  - * $Id: _hz.c,v 1.2 2003/05/31 11:50:19 perky Exp $
  + * $Id: _hz.c,v 1.3 2003/07/09 21:00:48 perky Exp $
    */
   
   #include "codeccommon.h"
  @@ -34,22 +34,36 @@
   ENCMAP(gbcommon)
   DECMAP(gb2312)
   
  +#define HAVE_ENCODER_INIT
  +ENCODER_INIT(hz)
  +{
  +    state->i = 0;
  +    return 0;
  +}
  +
  +#define HAVE_ENCODER_RESET
  +ENCODER_RESET(hz)
  +{
  +    if (state->i != 0) {
  +        WRITE2('~', '}')
  +        state->i = 0;
  +        NEXT_OUT(2)
  +    }
  +    return 0;
  +}
  +
   ENCODER(hz)
   {
       while (inleft > 0) {
  -        Py_UNICODE  c = **inbuf;
  +        Py_UNICODE  c = IN1;
           DBCHAR      code;
   
           if (c < 0x80) {
               if (state->i == 0) {
  -                RESERVE_OUTBUF(1)
  -                **outbuf = c;
  +                WRITE1(c)
                   NEXT(1, 1)
               } else {
  -                RESERVE_OUTBUF(3)
  -                (*outbuf)[0] = '~';
  -                (*outbuf)[1] = '}';
  -                (*outbuf)[2] = (unsigned char)c;
  +                WRITE3('~', '}', c)
                   NEXT(1, 3)
                   state->i = 0;
               }
  @@ -65,17 +79,11 @@
               return 1;
   
           if (state->i == 0) {
  -            RESERVE_OUTBUF(4)
  -            (*outbuf)[0] = '~';
  -            (*outbuf)[1] = '{';
  -            (*outbuf)[2] = code >> 8;
  -            (*outbuf)[3] = code & 0xFF;
  +            WRITE4('~', '{', code >> 8, code & 0xff)
               NEXT(1, 4)
               state->i = 1;
           } else {
  -            RESERVE_OUTBUF(2)
  -            (*outbuf)[0] = code >> 8;
  -            (*outbuf)[1] = code & 0xFF;
  +            WRITE2(code >> 8, code & 0xff)
               NEXT(1, 2)
           }
       }
  @@ -83,18 +91,31 @@
       return 0;
   }
   
  +#define HAVE_DECODER_INIT
  +DECODER_INIT(hz)
  +{
  +    state->i = 0;
  +    return 0;
  +}
  +
  +#define HAVE_DECODER_RESET
  +DECODER_RESET(hz)
  +{
  +    state->i = 0;
  +    return 0;
  +}
  +
   DECODER(hz)
   {
       while (inleft > 0) {
  -        unsigned char    c = **inbuf;
  +        unsigned char    c = IN1;
   
           if (c == '~') {
  -            unsigned char    c2 = (*inbuf)[1];
  +            unsigned char    c2 = IN2;
   
               RESERVE_INBUF(2)
               if (c2 == '~') {
  -                RESERVE_OUTBUF(1)
  -                **outbuf = '~';
  +                WRITE1('~')
                   NEXT(2, 1)
                   continue;
               } else if (c2 == '{' && state->i == 0)
  @@ -113,13 +134,12 @@
               return 1;
   
           if (state->i == 0) { /* ASCII mode */
  -            RESERVE_OUTBUF(1)
  -            **outbuf = c;
  +            WRITE1(c)
               NEXT(1, 1)
           } else { /* GB mode */
               RESERVE_INBUF(2)
  -            TRYMAP_DEC(gb2312, **outbuf, c, (*inbuf)[1]) {
  -                RESERVE_OUTBUF(1)
  +            RESERVE_OUTBUF(1)
  +            TRYMAP_DEC(gb2312, **outbuf, c, IN2) {
                   NEXT(2, 1)
               } else
                   return 2;