lsm/mdbtools
1
0
Fork 0
mirror of https://github.com/mdbtools/mdbtools.git synced 2026-03-10 00:20:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Clean up some gcc4 warnings and errors

Browse Source
This commit is contained in:
whydoubt
2005-04-29 03:08:12 +00:00
parent 2983da266c
commit e0cb6caa73
5 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libmdb/backend.c
View File

@@ -35,7 +35,7 @@
#endif /* JAVA */
static int is_init;
static GHashTable *mdb_backends;
GHashTable *mdb_backends;
/* Access data types */
static MdbBackendType mdb_access_types[] = {

14
src/libmdb/iconv.c
View File

@@ -43,7 +43,7 @@ mdb_unicode2ascii(MdbHandle *mdb, unsigned char *src, unsigned int slen, unsigne
unsigned int compress=1;
src += 2;
slen -= 2;
tmp = (char *)g_malloc(slen*2);
tmp = (unsigned char *)g_malloc(slen*2);
while (slen) {
if (*src == 0) {
compress = (compress) ? 0 : 1;
@@ -61,8 +61,8 @@ mdb_unicode2ascii(MdbHandle *mdb, unsigned char *src, unsigned int slen, unsigne
}
}
in_ptr = (tmp) ? tmp : src;
out_ptr = dest;
in_ptr = (char *)((tmp) ? tmp : src);
out_ptr = (char *)dest;
len_in = (tmp) ? tlen : slen;
len_out = dlen;
@@ -111,9 +111,9 @@ mdb_ascii2unicode(MdbHandle *mdb, unsigned char *src, unsigned int slen, unsigne
if ((!src) || (!dest))
return 0;
in_ptr = src;
out_ptr = dest;
len_in = (slen) ? slen : strlen(src);
in_ptr = (char *)src;
out_ptr = (char *)dest;
len_in = (slen) ? slen : strlen(in_ptr);
len_out = dlen;
#ifdef HAVE_ICONV
@@ -137,7 +137,7 @@ mdb_ascii2unicode(MdbHandle *mdb, unsigned char *src, unsigned int slen, unsigne
/* Unicode Compression */
if(IS_JET4(mdb) && (dlen>4)) {
char *tmp = g_malloc(dlen);
unsigned char *tmp = g_malloc(dlen);
unsigned int tptr = 0, dptr = 0;
int comp = 1;

6
src/libmdb/table.c
View File

@@ -77,7 +77,7 @@ MdbTableDef *mdb_read_table(MdbCatalogEntry *entry)
MdbHandle *mdb = entry->mdb;
MdbFormatConstants *fmt = mdb->fmt;
int len, row_start, pg_row;
char *buf, *pg_buf = mdb->pg_buf;
unsigned char *buf, *pg_buf = mdb->pg_buf;
mdb_read_pg(mdb, entry->table_pg);
if (pg_buf[0] != 0x02) /* not a valid table def page */
@@ -270,7 +270,7 @@ GPtrArray *mdb_read_columns(MdbTableDef *table)
** column names - ordered the same as the column attributes table
*/
for (i=0;i<table->num_cols;i++) {
char *tmp_buf;
unsigned char *tmp_buf;
pcol = g_ptr_array_index(table->columns, i);
if (IS_JET4(mdb)) {
@@ -284,7 +284,7 @@ GPtrArray *mdb_read_columns(MdbTableDef *table)
fprintf(stderr,"Unknown MDB version\n");
continue;
}
tmp_buf = (char *) g_malloc(name_sz);
tmp_buf = (unsigned char *) g_malloc(name_sz);
read_pg_if_n(mdb, tmp_buf, &cur_pos, name_sz);
mdb_unicode2ascii(mdb, tmp_buf, name_sz, pcol->name, MDB_MAX_OBJ_NAME);
g_free(tmp_buf);