lsm/mdbtools
1
0
Fork 0
mirror of https://github.com/mdbtools/mdbtools.git synced 2025-11-26 02:09:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use size_t instead of unsigned int for calling iconv

Browse Source
This commit is contained in:
whydoubt
2005-08-05 15:52:16 +00:00
parent eb9bba1d10
commit c6300ecf16
3 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -1,3 +1,7 @@
Fri Aug 5 10:49:57 CDT 2005 Jeff Smith <whydoubt@yahoo.com>
* include/mdbtools.h:
* src/libmdb/iconv.h: Use size_t instead of unsigned int for calling iconv
Sat Jul 2 02:12:39 CDT 2005 Jeff Smith <whydoubt@yahoo.com> Sat Jul 2 02:12:39 CDT 2005 Jeff Smith <whydoubt@yahoo.com>
* include/mdbtools.h: * include/mdbtools.h:
* src/libmdb/data.c: * src/libmdb/data.c:

4
include/mdbtools.h
View File

@@ -528,8 +528,8 @@ extern int mdb_get_option(unsigned long optnum);
extern void mdb_debug(int klass, char *fmt, ...); extern void mdb_debug(int klass, char *fmt, ...);
/* iconv.c */ /* iconv.c */
extern int mdb_unicode2ascii(MdbHandle *mdb, char *src, unsigned int slen, char *dest, unsigned int dlen); extern int mdb_unicode2ascii(MdbHandle *mdb, char *src, size_t slen, char *dest, size_t dlen);
extern int mdb_ascii2unicode(MdbHandle *mdb, char *src, unsigned int slen, char *dest, unsigned int dlen); extern int mdb_ascii2unicode(MdbHandle *mdb, char *src, size_t slen, char *dest, size_t dlen);
extern void mdb_iconv_init(MdbHandle *mdb); extern void mdb_iconv_init(MdbHandle *mdb);
extern void mdb_iconv_close(MdbHandle *mdb); extern void mdb_iconv_close(MdbHandle *mdb);

16
src/libmdb/iconv.c
View File

@@ -28,11 +28,11 @@
* This function is used in reading text data from an MDB table. * This function is used in reading text data from an MDB table.
*/ */
int int
mdb_unicode2ascii(MdbHandle *mdb, char *src, unsigned int slen, char *dest, unsigned int dlen) mdb_unicode2ascii(MdbHandle *mdb, char *src, size_t slen, char *dest, size_t dlen)
{ {
char *tmp = NULL; char *tmp = NULL;
unsigned int tlen = 0; size_t tlen = 0;
unsigned int len_in, len_out; size_t len_in, len_out;
char *in_ptr, *out_ptr; char *in_ptr, *out_ptr;
if ((!src) || (!dest) || (!dlen)) if ((!src) || (!dest) || (!dlen))
@@ -104,7 +104,7 @@ mdb_unicode2ascii(MdbHandle *mdb, char *src, unsigned int slen, char *dest, unsi
* If slen is 0, strlen will be used to calculate src's length. * If slen is 0, strlen will be used to calculate src's length.
*/ */
int int
mdb_ascii2unicode(MdbHandle *mdb, char *src, unsigned int slen, char *dest, unsigned int dlen) mdb_ascii2unicode(MdbHandle *mdb, char *src, size_t slen, char *dest, size_t dlen)
{ {
size_t len_in, len_out; size_t len_in, len_out;
char *in_ptr, *out_ptr; char *in_ptr, *out_ptr;
@@ -180,10 +180,10 @@ mdb_ascii2unicode(MdbHandle *mdb, char *src, unsigned int slen, char *dest, unsi
void mdb_iconv_init(MdbHandle *mdb) void mdb_iconv_init(MdbHandle *mdb)
{ {
char *iconv_code; const char *iconv_code;
/* check environment variable */ /* check environment variable */
if (!(iconv_code=(char *)getenv("MDB_ICONV"))) { if (!(iconv_code=getenv("MDB_ICONV"))) {
iconv_code="UTF-8"; iconv_code="UTF-8";
} }
@@ -194,10 +194,10 @@ void mdb_iconv_init(MdbHandle *mdb)
} else { } else {
/* According to Microsoft Knowledge Base pages 289525 and */ /* According to Microsoft Knowledge Base pages 289525 and */
/* 202427, code page info is not contained in the database */ /* 202427, code page info is not contained in the database */
char *jet3_iconv_code; const char *jet3_iconv_code;
/* check environment variable */ /* check environment variable */
if (!(jet3_iconv_code=(char *)getenv("MDB_JET3_CHARSET"))) { if (!(jet3_iconv_code=getenv("MDB_JET3_CHARSET"))) {
jet3_iconv_code="CP1252"; jet3_iconv_code="CP1252";
} }