[KoCo-CVS] [Commit] cjkcodecs/src _big5.c _cp932.c _cp949.c _cp950.c _euc_kr.c _gb18030.c _gb2312.c
Brought to you by:
perky
Menu
▾
▴
[KoCo-CVS] [Commit] cjkcodecs/src _big5.c _cp932.c _cp949.c _cp950.c _euc_kr.c _gb18030.c _gb2312.c _gbk.c
|
From: Hye-Shik C. <pe...@us...> - 2003-06-09 10:25:39
|
perky 03/06/09 03:25:37
Modified: src _big5.c _cp932.c _cp949.c _cp950.c _euc_kr.c
_gb18030.c _gb2312.c _gbk.c
Log:
Reduce useless intermediate buffers.
Revision Changes Path
1.6 +4 -7 cjkcodecs/src/_big5.c
Index: _big5.c
===================================================================
RCS file: /cvsroot/koco/cjkcodecs/src/_big5.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- _big5.c 31 May 2003 11:50:18 -0000 1.5
+++ _big5.c 9 Jun 2003 10:25:36 -0000 1.6
@@ -26,7 +26,7 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: _big5.c,v 1.5 2003/05/31 11:50:18 perky Exp $
+ * $Id: _big5.c,v 1.6 2003/06/09 10:25:36 perky Exp $
*/
#include "codeccommon.h"
@@ -65,7 +65,6 @@
{
while (inleft > 0) {
unsigned char c = **inbuf;
- Py_UNICODE code;
RESERVE_OUTBUF(1)
@@ -76,11 +75,9 @@
}
RESERVE_INBUF(2)
- TRYMAP_DEC(big5, code, c, (*inbuf)[1]);
- else return 2;
-
- **outbuf = code;
- NEXT(2, 1)
+ TRYMAP_DEC(big5, **outbuf, c, (*inbuf)[1]) {
+ NEXT(2, 1)
+ } else return 2;
}
return 0;
1.3 +4 -6 cjkcodecs/src/_cp932.c
Index: _cp932.c
===================================================================
RCS file: /cvsroot/koco/cjkcodecs/src/_cp932.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- _cp932.c 31 May 2003 11:50:19 -0000 1.2
+++ _cp932.c 9 Jun 2003 10:25:36 -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: _cp932.c,v 1.2 2003/05/31 11:50:19 perky Exp $
+ * $Id: _cp932.c,v 1.3 2003/06/09 10:25:36 perky Exp $
*/
#include "codeccommon.h"
@@ -91,7 +91,6 @@
{
while (inleft > 0) {
unsigned char c = **inbuf, c2;
- Py_UNICODE code;
RESERVE_OUTBUF(1)
if (c < 0x80) {
@@ -103,7 +102,7 @@
RESERVE_INBUF(2)
c2 = (*inbuf)[1];
- TRYMAP_DEC(cp932ext, code, c, c2);
+ TRYMAP_DEC(cp932ext, **outbuf, c, c2);
else if ((c >= 0x81 && c <= 0x9f) || (c >= 0xe0 && c <= 0xea)) {
if (c2 < 0x40 || (c2 > 0x7e && c2 < 0x80) || c2 > 0xfc)
return 2;
@@ -113,18 +112,17 @@
c = (2 * c + (c2 < 0x5e ? 0 : 1) + 0x21);
c2 = (c2 < 0x5e ? c2 : c2 - 0x5e) + 0x21;
- TRYMAP_DEC(jisx0208, code, c, c2);
+ TRYMAP_DEC(jisx0208, **outbuf, c, c2);
else return 2;
} else if (c >= 0xf0 && c <= 0xf9) {
if ((c2 >= 0x40 && c2 <= 0x7e) || (c2 >= 0x80 && c2 <= 0xfc))
- code = 0xe000 + 188 * (c - 0xf0) +
+ **outbuf = 0xe000 + 188 * (c - 0xf0) +
(c2 < 0x80 ? c2 - 0x40 : c2 - 0x41);
else
return 2;
} else
return 2;
- **outbuf = code;
NEXT(2, 1)
}
1.10 +3 -5 cjkcodecs/src/_cp949.c
Index: _cp949.c
===================================================================
RCS file: /cvsroot/koco/cjkcodecs/src/_cp949.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- _cp949.c 31 May 2003 11:50:19 -0000 1.9
+++ _cp949.c 9 Jun 2003 10:25:36 -0000 1.10
@@ -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.9 2003/05/31 11:50:19 perky Exp $
+ * $Id: _cp949.c,v 1.10 2003/06/09 10:25:36 perky Exp $
*/
#include "codeccommon.h"
@@ -68,7 +68,6 @@
{
while (inleft > 0) {
unsigned char c = **inbuf;
- Py_UNICODE code;
RESERVE_OUTBUF(1)
@@ -79,11 +78,10 @@
}
RESERVE_INBUF(2)
- TRYMAP_DEC(ksx1001, code, c ^ 0x80, (*inbuf)[1] ^ 0x80);
- else TRYMAP_DEC(cp949ext, code, c, (*inbuf)[1]);
+ TRYMAP_DEC(ksx1001, **outbuf, c ^ 0x80, (*inbuf)[1] ^ 0x80);
+ else TRYMAP_DEC(cp949ext, **outbuf, c, (*inbuf)[1]);
else return 2;
- **outbuf = code;
NEXT(2, 1)
}
1.6 +3 -5 cjkcodecs/src/_cp950.c
Index: _cp950.c
===================================================================
RCS file: /cvsroot/koco/cjkcodecs/src/_cp950.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- _cp950.c 31 May 2003 11:50:19 -0000 1.5
+++ _cp950.c 9 Jun 2003 10:25:36 -0000 1.6
@@ -26,7 +26,7 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: _cp950.c,v 1.5 2003/05/31 11:50:19 perky Exp $
+ * $Id: _cp950.c,v 1.6 2003/06/09 10:25:36 perky Exp $
*/
#include "codeccommon.h"
@@ -67,7 +67,6 @@
{
while (inleft > 0) {
unsigned char c = **inbuf;
- Py_UNICODE code;
RESERVE_OUTBUF(1)
@@ -79,11 +78,10 @@
RESERVE_INBUF(2)
- TRYMAP_DEC(cp950ext, code, c, (*inbuf)[1]);
- else TRYMAP_DEC(big5, code, c, (*inbuf)[1]);
+ TRYMAP_DEC(cp950ext, **outbuf, c, (*inbuf)[1]);
+ else TRYMAP_DEC(big5, **outbuf, c, (*inbuf)[1]);
else return 2;
- **outbuf = code;
NEXT(2, 1)
}
1.13 +4 -6 cjkcodecs/src/_euc_kr.c
Index: _euc_kr.c
===================================================================
RCS file: /cvsroot/koco/cjkcodecs/src/_euc_kr.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- _euc_kr.c 31 May 2003 11:50:19 -0000 1.12
+++ _euc_kr.c 9 Jun 2003 10:25:36 -0000 1.13
@@ -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.12 2003/05/31 11:50:19 perky Exp $
+ * $Id: _euc_kr.c,v 1.13 2003/06/09 10:25:36 perky Exp $
*/
#include "codeccommon.h"
@@ -67,7 +67,6 @@
{
while (inleft > 0) {
unsigned char c = **inbuf;
- Py_UNICODE code;
RESERVE_OUTBUF(1)
@@ -79,11 +78,10 @@
RESERVE_INBUF(2)
- TRYMAP_DEC(ksx1001, code, c ^ 0x80, (*inbuf)[1] ^ 0x80);
- else return 2;
+ TRYMAP_DEC(ksx1001, **outbuf, c ^ 0x80, (*inbuf)[1] ^ 0x80) {
+ NEXT(2, 1)
+ } else return 2;
- **outbuf = code;
- NEXT(2, 1)
}
return 0;
1.7 +5 -7 cjkcodecs/src/_gb18030.c
Index: _gb18030.c
===================================================================
RCS file: /cvsroot/koco/cjkcodecs/src/_gb18030.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- _gb18030.c 31 May 2003 11:50:19 -0000 1.6
+++ _gb18030.c 9 Jun 2003 10:25:36 -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: _gb18030.c,v 1.6 2003/05/31 11:50:19 perky Exp $
+ * $Id: _gb18030.c,v 1.7 2003/06/09 10:25:36 perky Exp $
*/
#include "codeccommon.h"
@@ -126,7 +126,6 @@
{
while (inleft > 0) {
unsigned char c = **inbuf, c2;
- Py_UNICODE code;
RESERVE_OUTBUF(1)
@@ -178,13 +177,12 @@
return 4;
}
- GBK_PREDECODE(c, c2, code)
- else TRYMAP_DEC(gb2312, code, c ^ 0x80, c2 ^ 0x80);
- else TRYMAP_DEC(gbkext, code, c, c2);
- else TRYMAP_DEC(gb18030ext, code, c, c2);
+ GBK_PREDECODE(c, c2, **outbuf)
+ else TRYMAP_DEC(gb2312, **outbuf, c ^ 0x80, c2 ^ 0x80);
+ else TRYMAP_DEC(gbkext, **outbuf, c, c2);
+ else TRYMAP_DEC(gb18030ext, **outbuf, c, c2);
else return 2;
- **outbuf = code;
NEXT(2, 1)
}
1.8 +4 -7 cjkcodecs/src/_gb2312.c
Index: _gb2312.c
===================================================================
RCS file: /cvsroot/koco/cjkcodecs/src/_gb2312.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- _gb2312.c 31 May 2003 11:50:19 -0000 1.7
+++ _gb2312.c 9 Jun 2003 10:25:36 -0000 1.8
@@ -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.7 2003/05/31 11:50:19 perky Exp $
+ * $Id: _gb2312.c,v 1.8 2003/06/09 10:25:36 perky Exp $
*/
#include "codeccommon.h"
@@ -67,7 +67,6 @@
{
while (inleft > 0) {
unsigned char c = **inbuf;
- Py_UNICODE code;
RESERVE_OUTBUF(1)
@@ -78,11 +77,9 @@
}
RESERVE_INBUF(2)
- TRYMAP_DEC(gb2312, code, c ^ 0x80, (*inbuf)[1] ^ 0x80);
- else return 2;
-
- **outbuf = code;
- NEXT(2, 1)
+ TRYMAP_DEC(gb2312, **outbuf, c ^ 0x80, (*inbuf)[1] ^ 0x80) {
+ NEXT(2, 1)
+ } else return 2;
}
return 0;
1.7 +4 -6 cjkcodecs/src/_gbk.c
Index: _gbk.c
===================================================================
RCS file: /cvsroot/koco/cjkcodecs/src/_gbk.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- _gbk.c 31 May 2003 11:50:19 -0000 1.6
+++ _gbk.c 9 Jun 2003 10:25:36 -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: _gbk.c,v 1.6 2003/05/31 11:50:19 perky Exp $
+ * $Id: _gbk.c,v 1.7 2003/06/09 10:25:36 perky Exp $
*/
#include "codeccommon.h"
@@ -71,7 +71,6 @@
{
while (inleft > 0) {
unsigned char c = **inbuf;
- Py_UNICODE code;
RESERVE_OUTBUF(1)
@@ -83,12 +82,11 @@
RESERVE_INBUF(2)
- GBK_PREDECODE(c, (*inbuf)[1], code)
- else TRYMAP_DEC(gb2312, code, c ^ 0x80, (*inbuf)[1] ^ 0x80);
- else TRYMAP_DEC(gbkext, code, c, (*inbuf)[1]);
+ GBK_PREDECODE(c, (*inbuf)[1], **outbuf)
+ else TRYMAP_DEC(gb2312, **outbuf, c ^ 0x80, (*inbuf)[1] ^ 0x80);
+ else TRYMAP_DEC(gbkext, **outbuf, c, (*inbuf)[1]);
else return 2;
- **outbuf = code;
NEXT(2, 1)
}
|
