perky 03/05/19 16:07:13
Modified: src _cp949.c _euc_kr.c cjkcommon.h codeccommon.h
Log:
Typedef encode_map and decode_map from each of struct unim_index and
struct dbcs_index to make it more readable.
Revision Changes Path
1.2 +3 -3 cjkcodecs/src/_cp949.c
Index: _cp949.c
===================================================================
RCS file: /cvsroot/koco/cjkcodecs/src/_cp949.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- _cp949.c 19 May 2003 10:38:08 -0000 1.1
+++ _cp949.c 19 May 2003 23:07:12 -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: _cp949.c,v 1.1 2003/05/19 10:38:08 perky Exp $
+ * $Id: _cp949.c,v 1.2 2003/05/19 23:07:12 perky Exp $
*/
#include "codeccommon.h"
@@ -38,7 +38,7 @@
ENCODER(cp949)
{
while (inleft > 0) {
- const struct unim_index *map;
+ const encode_map *map;
Py_UNICODE c = **inbuf, clow;
DBCHAR code;
@@ -74,7 +74,7 @@
DECODER(cp949)
{
while (inleft > 0) {
- const struct dbcs_index *map;
+ const decode_map *map;
unsigned char c = **inbuf, c2;
Py_UNICODE code;
1.5 +3 -3 cjkcodecs/src/_euc_kr.c
Index: _euc_kr.c
===================================================================
RCS file: /cvsroot/koco/cjkcodecs/src/_euc_kr.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- _euc_kr.c 19 May 2003 10:38:08 -0000 1.4
+++ _euc_kr.c 19 May 2003 23:07:12 -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: _euc_kr.c,v 1.4 2003/05/19 10:38:08 perky Exp $
+ * $Id: _euc_kr.c,v 1.5 2003/05/19 23:07:12 perky Exp $
*/
#include "codeccommon.h"
@@ -37,7 +37,7 @@
ENCODER(euc_kr)
{
while (inleft > 0) {
- const struct unim_index *map;
+ const encode_map *map;
Py_UNICODE c = **inbuf, clow;
DBCHAR code;
@@ -72,7 +72,7 @@
DECODER(euc_kr)
{
while (inleft > 0) {
- const struct dbcs_index *map;
+ const decode_map *map;
unsigned char c = **inbuf, c2;
Py_UNICODE code;
1.8 +3 -1 cjkcodecs/src/cjkcommon.h
Index: cjkcommon.h
===================================================================
RCS file: /cvsroot/koco/cjkcodecs/src/cjkcommon.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- cjkcommon.h 19 May 2003 10:45:48 -0000 1.7
+++ cjkcommon.h 19 May 2003 23:07:12 -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: cjkcommon.h,v 1.7 2003/05/19 10:45:48 perky Exp $
+ * $Id: cjkcommon.h,v 1.8 2003/05/19 23:07:12 perky Exp $
*/
#ifndef _CJKCOMMON_H_
@@ -41,11 +41,13 @@
const Py_UNICODE *map;
unsigned char bottom, top;
};
+typedef struct dbcs_index decode_map;
struct unim_index {
const DBCHAR *map;
unsigned char bottom, top;
};
+typedef struct unim_index encode_map;
struct dbcs_map {
const char *charset;
1.3 +3 -3 cjkcodecs/src/codeccommon.h
Index: codeccommon.h
===================================================================
RCS file: /cvsroot/koco/cjkcodecs/src/codeccommon.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- codeccommon.h 19 May 2003 08:12:24 -0000 1.2
+++ codeccommon.h 19 May 2003 23:07:12 -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: codeccommon.h,v 1.2 2003/05/19 08:12:24 perky Exp $
+ * $Id: codeccommon.h,v 1.3 2003/05/19 23:07:12 perky Exp $
*/
#include "Python.h"
@@ -34,9 +34,9 @@
#include "cjkcommon.h"
#define ENCMAP(encoding) \
- const static struct unim_index *encoding##encmap;
+ const static encode_map *encoding##encmap;
#define DECMAP(encoding) \
- const static struct dbcs_index *encoding##decmap;
+ const static decode_map *encoding##decmap;
#define ENCODER(encoding) \
static int encoding##_encode( \
|