[KoCo-CVS] [Commit] cjkcodecs/src _cp949.c _euc_kr.c _gb2312.c codeccommon.h

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

perky       03/05/20 03:08:48

  Modified:    src      _cp949.c _euc_kr.c _gb2312.c codeccommon.h
  Log:
  Add UCS4INVALID macro to avoid > 0xffff characters on ucs4
  
  Revision  Changes    Path
  1.4       +2 -1      cjkcodecs/src/_cp949.c
  
  Index: _cp949.c
  ===================================================================
  RCS file: /cvsroot/koco/cjkcodecs/src/_cp949.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- _cp949.c	19 May 2003 23:12:28 -0000	1.3
  +++ _cp949.c	20 May 2003 10:08:47 -0000	1.4
  @@ -26,7 +26,7 @@
    * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
    * POSSIBILITY OF SUCH DAMAGE.
    *
  - * $Id: _cp949.c,v 1.3 2003/05/19 23:12:28 perky Exp $
  + * $Id: _cp949.c,v 1.4 2003/05/20 10:08:47 perky Exp $
    */
   
   #include "codeccommon.h"
  @@ -50,6 +50,7 @@
               (*outbuf)++; outleft--;
               continue;
           }
  +        UCS4INVALID(c)
   
           if (outleft < 2)
               return MBERR_TOOSMALL;
  
  
  
  1.7       +2 -1      cjkcodecs/src/_euc_kr.c
  
  Index: _euc_kr.c
  ===================================================================
  RCS file: /cvsroot/koco/cjkcodecs/src/_euc_kr.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- _euc_kr.c	19 May 2003 23:34:54 -0000	1.6
  +++ _euc_kr.c	20 May 2003 10:08:47 -0000	1.7
  @@ -26,7 +26,7 @@
    * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
    * POSSIBILITY OF SUCH DAMAGE.
    *
  - * $Id: _euc_kr.c,v 1.6 2003/05/19 23:34:54 perky Exp $
  + * $Id: _euc_kr.c,v 1.7 2003/05/20 10:08:47 perky Exp $
    */
   
   #include "codeccommon.h"
  @@ -49,6 +49,7 @@
               (*outbuf)++; outleft--;
               continue;
           }
  +        UCS4INVALID(c)
   
           if (outleft < 2)
               return MBERR_TOOSMALL;
  
  
  
  1.2       +2 -1      cjkcodecs/src/_gb2312.c
  
  Index: _gb2312.c
  ===================================================================
  RCS file: /cvsroot/koco/cjkcodecs/src/_gb2312.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- _gb2312.c	20 May 2003 07:31:37 -0000	1.1
  +++ _gb2312.c	20 May 2003 10:08:47 -0000	1.2
  @@ -26,7 +26,7 @@
    * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
    * POSSIBILITY OF SUCH DAMAGE.
    *
  - * $Id: _gb2312.c,v 1.1 2003/05/20 07:31:37 perky Exp $
  + * $Id: _gb2312.c,v 1.2 2003/05/20 10:08:47 perky Exp $
    */
   
   #include "codeccommon.h"
  @@ -49,6 +49,7 @@
               (*outbuf)++; outleft--;
               continue;
           }
  +        UCS4INVALID(c)
   
           if (outleft < 2)
               return MBERR_TOOSMALL;
  
  
  
  1.5       +9 -1      cjkcodecs/src/codeccommon.h
  
  Index: codeccommon.h
  ===================================================================
  RCS file: /cvsroot/koco/cjkcodecs/src/codeccommon.h,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- codeccommon.h	20 May 2003 04:11:44 -0000	1.4
  +++ codeccommon.h	20 May 2003 10:08:47 -0000	1.5
  @@ -26,7 +26,7 @@
    * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
    * POSSIBILITY OF SUCH DAMAGE.
    *
  - * $Id: codeccommon.h,v 1.4 2003/05/20 04:11:44 perky Exp $
  + * $Id: codeccommon.h,v 1.5 2003/05/20 10:08:47 perky Exp $
    */
   
   #include "Python.h"
  @@ -79,6 +79,14 @@
       if (codec == NULL)                                      \
           goto errorexit;                                     \
       PyModule_AddObject(m, "codec", codec);
  +
  +#if Py_UNICODE_SIZE == 4
  +#define UCS4INVALID(code)                                   \
  +    if ((code) > 0xFFFF)                                    \
  +        return 1;
  +#else
  +#define UCS4INVALID(code)
  +#endif
   
   static int
   importmap(PyObject *mod, const char *symbol,