From kde-commits Thu Aug 30 21:19:24 2018 From: Jaroslaw Staniek Date: Thu, 30 Aug 2018 21:19:24 +0000 To: kde-commits Subject: [kexi/3.1] src/migration/mdb/3rdparty/mdbtools: Fix warnings mostly related unsigned char after merg Message-Id: X-MARC-Message: https://marc.info/?l=kde-commits&m=153566398603326 Git commit c9b2c9efc9cf9e8486bc28a8e7712521c7ba6b99 by Jaroslaw Staniek. Committed on 30/08/2018 at 20:52. Pushed by staniek into branch '3.1'. Fix warnings mostly related unsigned char after merging mdbtools cb65d4f3dd= d5d952 TRIVIAL FIXED-IN:3.1.1 M +10 -10 src/migration/mdb/3rdparty/mdbtools/include/mdbtools.h M +31 -31 src/migration/mdb/3rdparty/mdbtools/libmdb/data.c M +15 -15 src/migration/mdb/3rdparty/mdbtools/libmdb/file.c M +1 -1 src/migration/mdb/3rdparty/mdbtools/libmdb/iconv.c M +9 -9 src/migration/mdb/3rdparty/mdbtools/libmdb/index.c M +2 -2 src/migration/mdb/3rdparty/mdbtools/libmdb/map.c M +10 -10 src/migration/mdb/3rdparty/mdbtools/libmdb/table.c M +28 -28 src/migration/mdb/3rdparty/mdbtools/libmdb/write.c https://commits.kde.org/kexi/c9b2c9efc9cf9e8486bc28a8e7712521c7ba6b99 diff --git a/src/migration/mdb/3rdparty/mdbtools/include/mdbtools.h b/src/m= igration/mdb/3rdparty/mdbtools/include/mdbtools.h index 1adbc8bc3..3910653a0 100644 --- a/src/migration/mdb/3rdparty/mdbtools/include/mdbtools.h +++ b/src/migration/mdb/3rdparty/mdbtools/include/mdbtools.h @@ -494,11 +494,11 @@ extern LIBMDB_DLL gpointer mdb_g_malloc0 (gsiz= e n_bytes); extern LIBMDB_DLL ssize_t mdb_read_pg(MdbHandle *mdb, unsigned long pg); extern LIBMDB_DLL ssize_t mdb_read_alt_pg(MdbHandle *mdb, unsigned long pg= ); extern LIBMDB_DLL unsigned char mdb_get_byte(void *buf, int offset); -extern LIBMDB_DLL int mdb_get_int16(unsigned char *buf, int offset); -extern LIBMDB_DLL long mdb_get_int32(unsigned char *buf, int offset); -extern LIBMDB_DLL long mdb_get_int32_msb(unsigned char *buf, int offset); -extern LIBMDB_DLL float mdb_get_single(unsigned char *buf, int offset); -extern LIBMDB_DLL double mdb_get_double(unsigned char *buf, int offset); +extern LIBMDB_DLL int mdb_get_int16(char *buf, int offset); +extern LIBMDB_DLL long mdb_get_int32(char *buf, int offset); +extern LIBMDB_DLL long mdb_get_int32_msb(char *buf, int offset); +extern LIBMDB_DLL float mdb_get_single(char *buf, int offset); +extern LIBMDB_DLL double mdb_get_double(char *buf, int offset); extern LIBMDB_DLL unsigned char mdb_pg_get_byte(MdbHandle *mdb, int offset= ); extern LIBMDB_DLL int mdb_pg_get_int16(MdbHandle *mdb, int offset); extern LIBMDB_DLL long mdb_pg_get_int32(MdbHandle *mdb, int offset); @@ -529,7 +529,7 @@ extern LIBMDB_DLL void mdb_table_dump(MdbCatalogEntry *= entry); extern LIBMDB_DLL guint8 read_pg_if_8(MdbHandle *mdb, int *cur_pos); extern LIBMDB_DLL guint16 read_pg_if_16(MdbHandle *mdb, int *cur_pos); extern LIBMDB_DLL guint32 read_pg_if_32(MdbHandle *mdb, int *cur_pos); -extern LIBMDB_DLL void *read_pg_if_n(MdbHandle *mdb, unsigned char *buf, i= nt *cur_pos, size_t len); +extern LIBMDB_DLL void *read_pg_if_n(MdbHandle *mdb, char *buf, int *cur_p= os, size_t len); extern LIBMDB_DLL int mdb_is_user_table(MdbCatalogEntry *entry); extern LIBMDB_DLL int mdb_is_system_table(MdbCatalogEntry *entry); extern LIBMDB_DLL const char *mdb_table_get_prop(const MdbTableDef *table,= const gchar *key); @@ -544,7 +544,7 @@ extern LIBMDB_DLL int mdb_rewind_table(MdbTableDef *tab= le); extern LIBMDB_DLL int mdb_fetch_row(MdbTableDef *table); extern LIBMDB_DLL int mdb_is_fixed_col(MdbColumn *col); extern LIBMDB_DLL char *mdb_col_to_string(MdbHandle *mdb, char *buf, int s= tart, int datatype, int size); -extern LIBMDB_DLL int mdb_find_pg_row(MdbHandle *mdb, int pg_row, void **b= uf, int *off, size_t *len); +extern LIBMDB_DLL int mdb_find_pg_row(MdbHandle *mdb, int pg_row, char **b= uf, int *off, size_t *len); extern LIBMDB_DLL int mdb_find_row(MdbHandle *mdb, int row, int *start, si= ze_t *len); extern LIBMDB_DLL int mdb_find_end_of_row(MdbHandle *mdb, int row); extern LIBMDB_DLL int mdb_col_fixed_size(MdbColumn *col); @@ -609,9 +609,9 @@ extern LIBMDB_DLL void mdb_dump_stats(MdbHandle *mdb); extern LIBMDB_DLL int mdb_like_cmp(char *s, char *r); = /* write.c */ -extern LIBMDB_DLL void mdb_put_int16(unsigned char *buf, guint32 offset, g= uint32 value); -extern LIBMDB_DLL void mdb_put_int32(unsigned char *buf, guint32 offset, g= uint32 value); -extern LIBMDB_DLL void mdb_put_int32_msb(unsigned char *buf, guint32 offse= t, guint32 value); +extern LIBMDB_DLL void mdb_put_int16(char *buf, guint32 offset, guint32 va= lue); +extern LIBMDB_DLL void mdb_put_int32(char *buf, guint32 offset, guint32 va= lue); +extern LIBMDB_DLL void mdb_put_int32_msb(char *buf, guint32 offset, guint3= 2 value); extern LIBMDB_DLL int mdb_crack_row(MdbTableDef *table, int row_start, int= row_end, MdbField *fields); extern LIBMDB_DLL guint16 mdb_add_row_to_pg(MdbTableDef *table, unsigned c= har *row_buffer, int new_row_size); extern LIBMDB_DLL int mdb_update_index(MdbTableDef *table, MdbIndex *idx, = unsigned int num_fields, MdbField *fields, guint32 pgnum, guint16 rownum); diff --git a/src/migration/mdb/3rdparty/mdbtools/libmdb/data.c b/src/migrat= ion/mdb/3rdparty/mdbtools/libmdb/data.c index 4879dcd08..74fb1ba02 100644 --- a/src/migration/mdb/3rdparty/mdbtools/libmdb/data.c +++ b/src/migration/mdb/3rdparty/mdbtools/libmdb/data.c @@ -90,7 +90,7 @@ mdb_bind_column_by_name(MdbTableDef *table, const gchar *= col_name, void *bind_pt * * Returns: 0 on success. 1 on failure. */ -int mdb_find_pg_row(MdbHandle *mdb, int pg_row, void **buf, int *off, size= _t *len) +int mdb_find_pg_row(MdbHandle *mdb, int pg_row, char **buf, int *off, size= _t *len) { unsigned int pg =3D pg_row >> 8; unsigned int row =3D pg_row & 0xff; @@ -100,7 +100,7 @@ int mdb_find_pg_row(MdbHandle *mdb, int pg_row, void **= buf, int *off, size_t *le mdb_swap_pgbuf(mdb); mdb_find_row(mdb, row, off, len); mdb_swap_pgbuf(mdb); - *buf =3D mdb->alt_pg_buf; + *buf =3D(char *)mdb->alt_pg_buf; return 0; } = @@ -111,9 +111,9 @@ int mdb_find_row(MdbHandle *mdb, int row, int *start, s= ize_t *len) = if (row > 1000) return -1; = - *start =3D mdb_get_int16(mdb->pg_buf, rco + 2 + row*2); + *start =3D mdb_get_int16((char *)mdb->pg_buf, rco + 2 + row*2); next_start =3D (row =3D=3D 0) ? mdb->fmt->pg_size : - mdb_get_int16(mdb->pg_buf, rco + row*2) & OFFSET_MASK; + mdb_get_int16((char *)mdb->pg_buf, rco + row*2) & OFFSET_MASK; *len =3D next_start - (*start & OFFSET_MASK); return 0; } @@ -128,7 +128,7 @@ mdb_find_end_of_row(MdbHandle *mdb, int row) if (row > 1000) return -1; = row_end =3D (row =3D=3D 0) ? mdb->fmt->pg_size : - mdb_get_int16(mdb->pg_buf, rco + row*2) & OFFSET_MASK; + mdb_get_int16((char *)mdb->pg_buf, rco + row*2) & OFFSET_MASK; #else /* Search the previous "row start" values for the first non-'lookupflag' * one. If we don't find one, then the end of the page is the correct @@ -225,7 +225,7 @@ int ret; if (col->col_type =3D=3D MDB_NUMERIC) { str =3D mdb_numeric_to_string(mdb, start, col->col_prec, col->col_scal= e); } else { - str =3D mdb_col_to_string(mdb, mdb->pg_buf, start, col->col_type, len); + str =3D mdb_col_to_string(mdb, (char *)mdb->pg_buf, start, col->col_ty= pe, len); } strcpy(col->bind_ptr, str); g_free(str); @@ -337,14 +337,14 @@ int mdb_read_next_dpg(MdbTableDef *table) } = table->cur_phys_pg =3D next_pg; - if (mdb->pg_buf[0]=3D=3DMDB_PAGE_DATA && mdb_get_int32(mdb->pg_buf, 4)= =3D=3Dentry->table_pg) + if (mdb->pg_buf[0]=3D=3DMDB_PAGE_DATA && mdb_get_int32((char *)mdb->pg_b= uf, 4)=3D=3Dentry->table_pg) return table->cur_phys_pg; = /* On rare occasion, mdb_map_find_next will return a wrong page */ /* Found in a big file, over 4,000,000 records */ fprintf(stderr, "warning: page %d from map doesn't match: Type=3D%d, buf[4..7]=3D%ld Ex= pected table_pg=3D%ld\n", - next_pg, mdb->pg_buf[0], mdb_get_int32(mdb->pg_buf, 4), entry->table_pg= ); + next_pg, mdb->pg_buf[0], mdb_get_int32((char *)mdb->pg_buf, 4), entry->= table_pg); } fprintf(stderr, "Warning: defaulting to brute force read\n"); #endif @@ -352,7 +352,7 @@ int mdb_read_next_dpg(MdbTableDef *table) do { if (!mdb_read_pg(mdb, table->cur_phys_pg++)) return 0; - } while (mdb->pg_buf[0]!=3DMDB_PAGE_DATA || mdb_get_int32(mdb->pg_buf, 4)= !=3Dentry->table_pg); + } while (mdb->pg_buf[0]!=3DMDB_PAGE_DATA || mdb_get_int32((char *)mdb->pg= _buf, 4)!=3Dentry->table_pg); /* fprintf(stderr,"returning new page %ld\n", table->cur_phys_pg); */ return table->cur_phys_pg; } @@ -407,7 +407,7 @@ mdb_fetch_row(MdbTableDef *table) } mdb_read_pg(mdb, pg); } else { - rows =3D mdb_get_int16(mdb->pg_buf,fmt->row_count_offset); + rows =3D mdb_get_int16((char *)mdb->pg_buf, fmt->row_count_offset); = /* if at end of page, find a new data page */ if (table->cur_row >=3D rows) { @@ -473,7 +473,7 @@ size_t mdb_ole_read_next(MdbHandle *mdb, MdbColumn *col, void *ole_ptr) { guint32 ole_len; - unsigned char *buf; + char *buf; int row_start; size_t len; = @@ -497,7 +497,7 @@ mdb_ole_read_next(MdbHandle *mdb, MdbColumn *col, void = *ole_ptr) mdb_debug(MDB_DEBUG_OLE,"start %d len %d", row_start, len); = if (col->bind_ptr) - memcpy(col->bind_ptr, (char*)buf + row_start + 4, len - 4); + memcpy(col->bind_ptr, buf + row_start + 4, len - 4); col->cur_blob_pg_row =3D mdb_get_int32(buf, row_start); = return len - 4; @@ -506,7 +506,7 @@ size_t mdb_ole_read(MdbHandle *mdb, MdbColumn *col, void *ole_ptr, int chunk_size) { guint32 ole_len; - unsigned char *buf; + char *buf; int row_start; size_t len; = @@ -542,7 +542,7 @@ mdb_ole_read(MdbHandle *mdb, MdbColumn *col, void *ole_= ptr, int chunk_size) mdb_debug(MDB_DEBUG_OLE,"start %d len %d", row_start, len); = if (col->bind_ptr) { - memcpy(col->bind_ptr, (char*)buf + row_start, len); + memcpy(col->bind_ptr, buf + row_start, len); if (mdb_get_option(MDB_DEBUG_OLE)) mdb_buffer_dump(col->bind_ptr, 0, 16); } @@ -560,7 +560,7 @@ mdb_ole_read(MdbHandle *mdb, MdbColumn *col, void *ole_= ptr, int chunk_size) mdb_debug(MDB_DEBUG_OLE,"start %d len %d", row_start, len); = if (col->bind_ptr) - memcpy(col->bind_ptr, (char*)buf + row_start + 4, len - 4); + memcpy(col->bind_ptr, buf + row_start + 4, len - 4); col->cur_blob_pg_row =3D mdb_get_int32(buf, row_start); mdb_debug(MDB_DEBUG_OLE, "next pg_row %d", col->cur_blob_pg_row); = @@ -608,7 +608,7 @@ static size_t mdb_copy_ole(MdbHandle *mdb, void *dest, = int start, int size) guint32 ole_len; gint32 row_start, pg_row; size_t len; - void *buf, *pg_buf =3D mdb->pg_buf; + char *buf, *pg_buf =3D mdb->pg_buf; = if (sizepg_buf; + char *buf, *pg_buf =3D (char *)mdb->pg_buf; char *text =3D (char *) g_malloc(MDB_BIND_SIZE); = if (sizepg_buf, start); - uuid2 =3D mdb_get_int16(mdb->pg_buf, start + 2); - uuid3 =3D mdb_get_int16(mdb->pg_buf, start + 4); - uuid4 =3D mdb_get_int16(mdb->pg_buf, start + 6); - uuid5 =3D mdb_get_int16(mdb->pg_buf, start + 8); - uuid6 =3D mdb_get_int16(mdb->pg_buf, start + 10); - uuid7 =3D mdb_get_int16(mdb->pg_buf, start + 12); - uuid8 =3D mdb_get_int16(mdb->pg_buf, start + 14); + uuid1 =3D mdb_get_int16((char *)mdb->pg_buf, start); + uuid2 =3D mdb_get_int16((char *)mdb->pg_buf, start + 2); + uuid3 =3D mdb_get_int16((char *)mdb->pg_buf, start + 4); + uuid4 =3D mdb_get_int16((char *)mdb->pg_buf, start + 6); + uuid5 =3D mdb_get_int16((char *)mdb->pg_buf, start + 8); + uuid6 =3D mdb_get_int16((char *)mdb->pg_buf, start + 10); + uuid7 =3D mdb_get_int16((char *)mdb->pg_buf, start + 12); + uuid8 =3D mdb_get_int16((char *)mdb->pg_buf, start + 14); = text =3D g_strdup_printf("{%04x%04x-%04x-%04x-%04x-%04x%04x%04x}", uuid1, uuid2, uuid3, uuid4, uuid5, uuid6, uuid7, uuid8); @@ -932,7 +932,7 @@ char *mdb_col_to_string(MdbHandle *mdb, char *buf, int = start, int datatype, int text =3D g_strdup(""); } else { text =3D g_malloc(size); - memcpy(text, (char*)buf+start, size); + memcpy(text, buf+start, size); } break; case MDB_TEXT: @@ -940,7 +940,7 @@ char *mdb_col_to_string(MdbHandle *mdb, char *buf, int = start, int datatype, int text =3D g_strdup(""); } else { text =3D (char *) g_malloc(MDB_BIND_SIZE); - mdb_unicode2ascii(mdb, (char*)buf + start, + mdb_unicode2ascii(mdb, buf + start, size, text, MDB_BIND_SIZE); } break; diff --git a/src/migration/mdb/3rdparty/mdbtools/libmdb/file.c b/src/migrat= ion/mdb/3rdparty/mdbtools/libmdb/file.c index 08210626d..74f0c9f2c 100644 --- a/src/migration/mdb/3rdparty/mdbtools/libmdb/file.c +++ b/src/migration/mdb/3rdparty/mdbtools/libmdb/file.c @@ -249,7 +249,7 @@ MdbHandle *mdb_open(const char *filename, MdbFileFlags = flags) mdb_close(mdb); return NULL; } - mdb->f->jet_version =3D mdb_get_int32(mdb->pg_buf, 0x14); + mdb->f->jet_version =3D mdb_get_int32((char *)mdb->pg_buf, 0x14); switch(mdb->f->jet_version) { case MDB_VER_JET3: mdb->fmt =3D &MdbJet3Constants; @@ -264,7 +264,7 @@ MdbHandle *mdb_open(const char *filename, MdbFileFlags = flags) mdb_close(mdb); return NULL; } - mdb->f->db_key =3D mdb_get_int32(mdb->pg_buf, 0x3e); + mdb->f->db_key =3D mdb_get_int32((char *)mdb->pg_buf, 0x3e); /* I don't know if this value is valid for some versions? * it doesn't seem to be valid for the databases I have * @@ -292,7 +292,7 @@ MdbHandle *mdb_open(const char *filename, MdbFileFlags = flags) = /* get the db password located at 0x42 bytes into the file */ for (pos=3D0;pos<14;pos++) { - j =3D mdb_get_int32(mdb->pg_buf, 0x42+pos); + j =3D mdb_get_int32((char *)mdb->pg_buf, 0x42+pos); j ^=3D key[pos]; if ( j !=3D 0) mdb->f->db_passwd[pos] =3D j; @@ -468,26 +468,26 @@ unsigned char mdb_pg_get_byte(MdbHandle *mdb, int off= set) return mdb->pg_buf[offset]; } = -int mdb_get_int16(unsigned char *buf, int offset) +int mdb_get_int16(char *buf, int offset) { guint16 l; - memcpy(&l, (char*)buf + offset, 2); + memcpy(&l, buf + offset, 2); return (int)GUINT16_FROM_LE(l); } int mdb_pg_get_int16(MdbHandle *mdb, int offset) { if (offset < 0 || (offset+2) > (int)mdb->fmt->pg_size) return -1; mdb->cur_pos+=3D2; - return mdb_get_int16(mdb->pg_buf, offset); + return mdb_get_int16((char *)mdb->pg_buf, offset); } = -long mdb_get_int32_msb(unsigned char *buf, int offset) +long mdb_get_int32_msb(char *buf, int offset) { gint32 l; memcpy(&l, buf + offset, 4); return (long)GINT32_FROM_BE(l); } -long mdb_get_int32(unsigned char *buf, int offset) +long mdb_get_int32(char *buf, int offset) { gint32 l; memcpy(&l, buf + offset, 4); @@ -497,13 +497,13 @@ long mdb_pg_get_int32(MdbHandle *mdb, int offset) { if (offset <0 || (offset+4) > (int)mdb->fmt->pg_size) return -1; mdb->cur_pos+=3D4; - return mdb_get_int32(mdb->pg_buf, offset); + return mdb_get_int32((char *)mdb->pg_buf, offset); } = -float mdb_get_single(unsigned char *buf, int offset) +float mdb_get_single(char *buf, int offset) { union {guint32 g; float f;} f; - memcpy(&f, (char*)buf + offset, 4); + memcpy(&f, buf + offset, 4); f.g =3D GUINT32_FROM_LE(f.g); return f.f; } @@ -511,13 +511,13 @@ float mdb_pg_get_single(MdbHandle *mdb, int offset) { if (offset <0 || (offset+4) > (int)mdb->fmt->pg_size) return -1; mdb->cur_pos+=3D4; - return mdb_get_single(mdb->pg_buf, offset); + return mdb_get_single((char *)mdb->pg_buf, offset); } = -double mdb_get_double(unsigned char *buf, int offset) +double mdb_get_double(char *buf, int offset) { union {guint64 g; double d;} d; - memcpy(&d, (char*)buf + offset, 8); + memcpy(&d, buf + offset, 8); d.g =3D GUINT64_FROM_LE(d.g); return d.d; } @@ -525,7 +525,7 @@ double mdb_pg_get_double(MdbHandle *mdb, int offset) { if (offset <0 || (offset+8) > (int)mdb->fmt->pg_size) return -1; mdb->cur_pos+=3D8; - return mdb_get_double(mdb->pg_buf, offset); + return mdb_get_double((char *)mdb->pg_buf, offset); } = = diff --git a/src/migration/mdb/3rdparty/mdbtools/libmdb/iconv.c b/src/migra= tion/mdb/3rdparty/mdbtools/libmdb/iconv.c index 7f19cc08f..ee20ae3ce 100644 --- a/src/migration/mdb/3rdparty/mdbtools/libmdb/iconv.c +++ b/src/migration/mdb/3rdparty/mdbtools/libmdb/iconv.c @@ -47,7 +47,7 @@ mdb_unicode2ascii(MdbHandle *mdb, char *src, size_t slen,= char *dest, size_t dle unsigned int compress=3D1; src +=3D 2; slen -=3D 2; - tmp =3D (char *)g_malloc(slen*2); + tmp =3D g_malloc(slen*2); while (slen) { if (*src =3D=3D 0) { compress =3D (compress) ? 0 : 1; diff --git a/src/migration/mdb/3rdparty/mdbtools/libmdb/index.c b/src/migra= tion/mdb/3rdparty/mdbtools/libmdb/index.c index 865d5a4bf..72f071f47 100644 --- a/src/migration/mdb/3rdparty/mdbtools/libmdb/index.c +++ b/src/migration/mdb/3rdparty/mdbtools/libmdb/index.c @@ -72,7 +72,7 @@ mdb_read_indices(MdbTableDef *table) int key_num, col_num, cleaned_col_num; int cur_pos, name_sz, idx2_sz, type_offset; int index_start_pg =3D mdb->cur_pg; - gchar *tmpbuf; + char *tmpbuf; = table->indices =3D g_ptr_array_new(); = @@ -91,7 +91,7 @@ mdb_read_indices(MdbTableDef *table) * It's not always the case. Happens on Northwind Orders table. */ table->num_real_idxs =3D 0; - tmpbuf =3D (gchar *) g_malloc(idx2_sz); + tmpbuf =3D g_malloc(idx2_sz); for (i=3D0;inum_idxs;i++) { read_pg_if_n(mdb, tmpbuf, &cur_pos, idx2_sz); pidx =3D (MdbIndex *) g_malloc0(sizeof(MdbIndex)); @@ -123,8 +123,8 @@ mdb_read_indices(MdbTableDef *table) name_sz=3Dread_pg_if_16(mdb, &cur_pos); } tmpbuf =3D g_malloc(name_sz); - read_pg_if_n(mdb, tmpbuf, &cur_pos, name_sz); - mdb_unicode2ascii(mdb, tmpbuf, name_sz, pidx->name, MDB_MAX_OBJ_NAME); + read_pg_if_n(mdb, (char *)tmpbuf, &cur_pos, name_sz); + mdb_unicode2ascii(mdb, (char *)tmpbuf, name_sz, pidx->name, MDB_MAX_OBJ_= NAME); g_free(tmpbuf); //fprintf(stderr, "index %d type %d name %s\n", pidx->index_num, pidx->i= ndex_type, pidx->name); } @@ -146,7 +146,7 @@ mdb_read_indices(MdbTableDef *table) } //fprintf(stderr, "index %d #%d (%s) index_type:%d\n", i, pidx->index_nu= m, pidx->name, pidx->index_type); = - pidx->num_rows =3D mdb_get_int32(mdb->alt_pg_buf, + pidx->num_rows =3D mdb_get_int32((char *)mdb->alt_pg_buf, fmt->tab_cols_start_offset + (pidx->index_num*fmt->tab_ridx_entry_size)); /* @@ -490,7 +490,7 @@ mdb_find_next_leaf(MdbHandle *mdb, MdbIndex *idx, MdbIn= dexChain *chain) //printf("find_next_on_page returned 0\n"); return 0; } - pg =3D mdb_get_int32_msb(mdb->pg_buf, ipg->offset + ipg->len - 3) >> 8; + pg =3D mdb_get_int32_msb((char *)mdb->pg_buf, ipg->offset + ipg->len - 3= ) >> 8; //printf("Looking at pg %lu at %lu %d\n", pg, ipg->offset, ipg->len); ipg->offset +=3D ipg->len; = @@ -624,7 +624,7 @@ mdb_index_find_next(MdbHandle *mdb, MdbIndex *idx, MdbI= ndexChain *chain, guint32 if (!chain->last_leaf_found) return 0; mdb_read_pg(mdb, chain->last_leaf_found); chain->last_leaf_found =3D mdb_get_int32( - mdb->pg_buf, 0x0c); + (char *)mdb->pg_buf, 0x0c); //printf("next leaf %lu\n", chain->last_leaf_found); mdb_read_pg(mdb, chain->last_leaf_found); /* reuse the chain for cleanup mode */ @@ -637,7 +637,7 @@ mdb_index_find_next(MdbHandle *mdb, MdbIndex *idx, MdbI= ndexChain *chain, guint32 return 0; } } - pg_row =3D mdb_get_int32_msb(mdb->pg_buf, ipg->offset + ipg->len - 4); + pg_row =3D mdb_get_int32_msb((char *)mdb->pg_buf, ipg->offset + ipg->len= - 4); *row =3D pg_row & 0xff; *pg =3D pg_row >> 8; //printf("row =3D %d pg =3D %lu ipg->pg =3D %lu offset =3D %lu len =3D %= d\n", *row, *pg, ipg->pg, ipg->offset, ipg->len); @@ -706,7 +706,7 @@ mdb_index_find_row(MdbHandle *mdb, MdbIndex *idx, MdbIn= dexChain *chain, guint32 return 0; } /* test row and pg */ - datapg_row =3D mdb_get_int32_msb(mdb->pg_buf, ipg->offset + ipg->len - 4= ); + datapg_row =3D mdb_get_int32_msb((char *)mdb->pg_buf, ipg->offset + ipg-= >len - 4); if (pg_row =3D=3D datapg_row) { passed =3D 1; } diff --git a/src/migration/mdb/3rdparty/mdbtools/libmdb/map.c b/src/migrati= on/mdb/3rdparty/mdbtools/libmdb/map.c index 25660745d..d177a0321 100644 --- a/src/migration/mdb/3rdparty/mdbtools/libmdb/map.c +++ b/src/migration/mdb/3rdparty/mdbtools/libmdb/map.c @@ -28,7 +28,7 @@ mdb_map_find_next0(MdbHandle *mdb, unsigned char *map, un= signed int map_sz, guin guint32 pgnum, i, usage_bitlen; unsigned char *usage_bitmap; = - pgnum =3D mdb_get_int32(map, 1); + pgnum =3D mdb_get_int32((char *)map, 1); usage_bitmap =3D map + 5; usage_bitlen =3D (map_sz - 5) * 8; = @@ -63,7 +63,7 @@ mdb_map_find_next1(MdbHandle *mdb, unsigned char *map, un= signed int map_sz, guin unsigned char *usage_bitmap; guint32 i, map_pg; = - if (!(map_pg =3D mdb_get_int32(map, (map_ind*4)+1))) { + if (!(map_pg =3D mdb_get_int32((char *)map, (map_ind*4)+1))) { continue; } if(mdb_read_alt_pg(mdb, map_pg) !=3D mdb->fmt->pg_size) { diff --git a/src/migration/mdb/3rdparty/mdbtools/libmdb/table.c b/src/migra= tion/mdb/3rdparty/mdbtools/libmdb/table.c index ad818f01d..a154e0f8e 100644 --- a/src/migration/mdb/3rdparty/mdbtools/libmdb/table.c +++ b/src/migration/mdb/3rdparty/mdbtools/libmdb/table.c @@ -76,7 +76,7 @@ MdbTableDef *mdb_read_table(MdbCatalogEntry *entry) MdbHandle *mdb =3D entry->mdb; MdbFormatConstants *fmt =3D mdb->fmt; int row_start, pg_row; - unsigned char *buf, *pg_buf =3D mdb->pg_buf; + char *buf, *pg_buf =3D (char *)mdb->pg_buf; guint i; = mdb_read_pg(mdb, entry->table_pg); @@ -157,7 +157,7 @@ read_pg_if_8(MdbHandle *mdb, int *cur_pos) { guint8 c; = - read_pg_if_n(mdb, &c, cur_pos, 1); + read_pg_if_n(mdb, (char *)&c, cur_pos, 1); return c; } /* @@ -166,12 +166,12 @@ read_pg_if_8(MdbHandle *mdb, int *cur_pos) * are still advanced and the page cursor is still updated. */ void * -read_pg_if_n(MdbHandle *mdb, unsigned char *buf, int *cur_pos, size_t len) +read_pg_if_n(MdbHandle *mdb, char *buf, int *cur_pos, size_t len) { char* _buf =3D buf; /* Advance to page which contains the first byte */ while (*cur_pos >=3D mdb->fmt->pg_size) { - mdb_read_pg(mdb, mdb_get_int32(mdb->pg_buf,4)); + mdb_read_pg(mdb, mdb_get_int32((char *)mdb->pg_buf,4)); *cur_pos -=3D (int)(mdb->fmt->pg_size - 8); } /* Copy pages into buffer */ @@ -182,7 +182,7 @@ read_pg_if_n(MdbHandle *mdb, unsigned char *buf, int *c= ur_pos, size_t len) _buf +=3D piece_len; } len -=3D piece_len; - mdb_read_pg(mdb, mdb_get_int32(mdb->pg_buf,4)); + mdb_read_pg(mdb, mdb_get_int32((char *)mdb->pg_buf,4)); *cur_pos =3D 8; } /* Copy into buffer from final page */ @@ -244,7 +244,7 @@ GPtrArray *mdb_read_columns(MdbTableDef *table) /* printf("column %d\n", i); mdb_buffer_dump(mdb->pg_buf, cur_pos, fmt->tab_col_entry_size); */ #endif - read_pg_if_n(mdb, col, &cur_pos, fmt->tab_col_entry_size); + read_pg_if_n(mdb, (char *)col, &cur_pos, fmt->tab_col_entry_size); pcol =3D (MdbColumn *) g_malloc0(sizeof(MdbColumn)); = pcol->table =3D table; @@ -256,11 +256,11 @@ GPtrArray *mdb_read_columns(MdbTableDef *table) = //fprintf(stdout,"----- column %d -----\n",pcol->col_num); // col_var =3D=3D 3 or 7 - pcol->var_col_num =3D mdb_get_int16(col, fmt->tab_col_offset_var); + pcol->var_col_num =3D mdb_get_int16((char *)col, fmt->tab_col_offset_var= ); //fprintf(stdout,"var column pos %d\n",pcol->var_col_num); = // col_var =3D=3D 5 or 9 - pcol->row_col_num =3D mdb_get_int16(col, fmt->tab_row_col_num_offset); + pcol->row_col_num =3D mdb_get_int16((char *)col, fmt->tab_row_col_num_of= fset); //fprintf(stdout,"row column num %d\n",pcol->row_col_num); = /* FIXME: can this be right in Jet3 and Jet4? */ @@ -275,13 +275,13 @@ GPtrArray *mdb_read_columns(MdbTableDef *table) pcol->is_uuid_auto =3D col[fmt->col_flags_offset] & 0x40 ? 1 : 0; = // tab_col_offset_fixed =3D=3D 14 or 21 - pcol->fixed_offset =3D mdb_get_int16(col, fmt->tab_col_offset_fixed); + pcol->fixed_offset =3D mdb_get_int16((char *)col, fmt->tab_col_offset_fi= xed); //fprintf(stdout,"fixed column offset %d\n",pcol->fixed_offset); //fprintf(stdout,"col type %s\n",pcol->is_fixed ? "fixed" : "variable"); = if (pcol->col_type !=3D MDB_BOOL) { // col_size_offset =3D=3D 16 or 23 - pcol->col_size =3D mdb_get_int16(col, fmt->col_size_offset); + pcol->col_size =3D mdb_get_int16((char *)col, fmt->col_size_offset); } else { pcol->col_size=3D0; } diff --git a/src/migration/mdb/3rdparty/mdbtools/libmdb/write.c b/src/migra= tion/mdb/3rdparty/mdbtools/libmdb/write.c index 15f26e4b0..f1daaa74e 100644 --- a/src/migration/mdb/3rdparty/mdbtools/libmdb/write.c +++ b/src/migration/mdb/3rdparty/mdbtools/libmdb/write.c @@ -29,10 +29,10 @@ static int mdb_add_row_to_leaf_pg(MdbTableDef *table, MdbIndex *idx, MdbIn= dexPage *ipg, MdbField *idx_fields, guint32 pgnum, guint16 rownum); = void -mdb_put_int16(unsigned char *buf, guint32 offset, guint32 value) +mdb_put_int16(char *buf, guint32 offset, guint32 value) { value =3D GINT32_TO_LE(value); - memcpy((char*)buf + offset, &value, 2); + memcpy(buf + offset, &value, 2); } void _mdb_put_int16(void *buf, guint32 offset, guint32 value) @@ -43,10 +43,10 @@ __attribute__((alias("mdb_put_int16"))); #endif = void -mdb_put_int32(unsigned char *buf, guint32 offset, guint32 value) +mdb_put_int32(char *buf, guint32 offset, guint32 value) { value =3D GINT32_TO_LE(value); - memcpy((char*)buf + offset, &value, 4); + memcpy(buf + offset, &value, 4); } void _mdb_put_int32(void *buf, guint32 offset, guint32 value) @@ -57,10 +57,10 @@ __attribute__((alias("mdb_put_int32"))); #endif = void -mdb_put_int32_msb(unsigned char *buf, guint32 offset, guint32 value) +mdb_put_int32_msb(char *buf, guint32 offset, guint32 value) { value =3D GINT32_TO_BE(value); - memcpy((char*)buf + offset, &value, 4); + memcpy(buf + offset, &value, 4); } void _mdb_put_int32_mdb(void *buf, guint32 offset, guint32 value) @@ -123,7 +123,7 @@ mdb_crack_row4(MdbHandle *mdb, int row_start, int row_e= nd, unsigned int bitmask_ unsigned int i; = for (i=3D0; ipg_buf, + var_col_offsets[i] =3D mdb_get_int16((char *)mdb->pg_buf, row_end - bitmask_sz - 3 - (i*2)); } } @@ -194,7 +194,7 @@ mdb_crack_row(MdbTableDef *table, int row_start, int ro= w_end, MdbField *fields) row_cols =3D mdb_get_byte(pg_buf, row_start); col_count_size =3D 1; } else { - row_cols =3D mdb_get_int16(pg_buf, row_start); + row_cols =3D mdb_get_int16((char *)pg_buf, row_start); col_count_size =3D 2; } = @@ -205,7 +205,7 @@ mdb_crack_row(MdbTableDef *table, int row_start, int ro= w_end, MdbField *fields) if (table->num_var_cols > 0) { row_var_cols =3D IS_JET3(mdb) ? mdb_get_byte(pg_buf, row_end - bitmask_sz) : - mdb_get_int16(pg_buf, row_end - bitmask_sz - 1); + mdb_get_int16((char *)pg_buf, row_end - bitmask_sz - 1); var_col_offsets =3D (unsigned int *)g_malloc((row_var_cols+1)*sizeof(int= )); if (IS_JET3(mdb)) { mdb_crack_row3(mdb, row_start, row_end, bitmask_sz, @@ -445,9 +445,9 @@ mdb_pg_get_freespace(MdbHandle *mdb) int rows, free_start, free_end; int row_count_offset =3D mdb->fmt->row_count_offset; = - rows =3D mdb_get_int16(mdb->pg_buf, row_count_offset); + rows =3D mdb_get_int16((char *)mdb->pg_buf, row_count_offset); free_start =3D row_count_offset + 2 + (rows * 2); - free_end =3D mdb_get_int16(mdb->pg_buf, row_count_offset + (rows * 2)); + free_end =3D mdb_get_int16((char *)mdb->pg_buf, row_count_offset + (rows = * 2)); mdb_debug(MDB_DEBUG_WRITE,"free space left on page =3D %d", free_end - fr= ee_start); return (free_end - free_start); } @@ -613,19 +613,19 @@ mdb_add_row_to_pg(MdbTableDef *table, unsigned char *= row_buffer, int new_row_siz g_ptr_array_add(pages, new_pg); } else { new_pg =3D g_ptr_array_index(pages, pages->len - 1); - if (mdb_get_int16(new_pg, 2) < new_row_size + 2) { + if (mdb_get_int16((char *)new_pg, 2) < new_row_size + 2) { new_pg =3D mdb_new_data_pg(entry); g_ptr_array_add(pages, new_pg); } } = - num_rows =3D mdb_get_int16(new_pg, fmt->row_count_offset); + num_rows =3D mdb_get_int16((char *)new_pg, fmt->row_count_offset); pos =3D (num_rows =3D=3D 0) ? fmt->pg_size : - mdb_get_int16(new_pg, fmt->row_count_offset + (num_rows*2)); + mdb_get_int16((char *)new_pg, fmt->row_count_offset + (num_rows*2)); } else { /* is not a temp table */ new_pg =3D mdb_new_data_pg(entry); = - num_rows =3D mdb_get_int16(mdb->pg_buf, fmt->row_count_offset); + num_rows =3D mdb_get_int16((char *)mdb->pg_buf, fmt->row_count_offset); pos =3D fmt->pg_size; = /* copy existing rows */ @@ -633,7 +633,7 @@ mdb_add_row_to_pg(MdbTableDef *table, unsigned char *ro= w_buffer, int new_row_siz mdb_find_row(mdb, i, &row_start, &row_size); pos -=3D row_size; memcpy((char*)new_pg + pos, mdb->pg_buf + row_start, row_size); - mdb_put_int16(new_pg, (fmt->row_count_offset + 2) + (i*2), pos); + mdb_put_int16((char *)new_pg, (fmt->row_count_offset + 2) + (i*2), pos); } } = @@ -641,14 +641,14 @@ mdb_add_row_to_pg(MdbTableDef *table, unsigned char *= row_buffer, int new_row_siz pos -=3D new_row_size; memcpy((char*)new_pg + pos, row_buffer, new_row_size); /* add row to the row offset table */ - mdb_put_int16(new_pg, (fmt->row_count_offset + 2) + (num_rows*2), pos); + mdb_put_int16((char *)new_pg, (fmt->row_count_offset + 2) + (num_rows*2),= pos); = /* update number rows on this page */ num_rows++; - mdb_put_int16(new_pg, fmt->row_count_offset, num_rows); + mdb_put_int16((char *)new_pg, fmt->row_count_offset, num_rows); = /* update the freespace */ - mdb_put_int16(new_pg,2,pos - fmt->row_count_offset - 2 - (num_rows*2)); + mdb_put_int16((char *)new_pg,2,pos - fmt->row_count_offset - 2 - (num_row= s*2)); = /* copy new page over old */ if (!table->is_temp_table) { @@ -743,8 +743,8 @@ int i, pos; mdb_debug(MDB_DEBUG_WRITE,"updating row %d on page %lu", row, (unsigned l= ong) table->cur_phys_pg); new_pg =3D mdb_new_data_pg(entry); = - num_rows =3D mdb_get_int16(mdb->pg_buf, rco); - mdb_put_int16(new_pg, rco, num_rows); + num_rows =3D mdb_get_int16((char *)mdb->pg_buf, rco); + mdb_put_int16((char *)new_pg, rco, num_rows); = pos =3D pg_size; = @@ -753,20 +753,20 @@ int i, pos; mdb_find_row(mdb, i, &row_start, &row_size); pos -=3D row_size; memcpy((char*)new_pg + pos, mdb->pg_buf + row_start, row_size); - mdb_put_int16(new_pg, rco + 2 + i*2, pos); + mdb_put_int16((char *)new_pg, rco + 2 + i*2, pos); } = /* our row */ pos -=3D new_row_size; memcpy((char*)new_pg + pos, new_row, new_row_size); - mdb_put_int16(new_pg, rco + 2 + row*2, pos); + mdb_put_int16((char *)new_pg, rco + 2 + row*2, pos); = /* rows after */ for (i=3Drow+1;ipg_buf + row_start, row_size); - mdb_put_int16(new_pg, rco + 2 + i*2, pos); + mdb_put_int16((char *)new_pg, rco + 2 + i*2, pos); } = /* almost done, copy page over current */ @@ -774,7 +774,7 @@ int i, pos; = g_free(new_pg); = - mdb_put_int16(mdb->pg_buf, 2, mdb_pg_get_freespace(mdb)); + mdb_put_int16((char *)mdb->pg_buf, 2, mdb_pg_get_freespace(mdb)); if (mdb_get_option(MDB_DEBUG_WRITE)) { mdb_buffer_dump(mdb->pg_buf, 0, 40); mdb_buffer_dump(mdb->pg_buf, pg_size - 160, 160); @@ -828,7 +828,7 @@ mdb_copy_index_pg(MdbTableDef *table, MdbIndex *idx, Md= bIndexPage *ipg) return 0; } = - pg_row =3D mdb_get_int32_msb(mdb->pg_buf, ipg->offset + ipg->len - 4); + pg_row =3D mdb_get_int32_msb((char *)mdb->pg_buf, ipg->offset + ipg->len= - 4); /* guint32 pg =3D pg_row >> 8; */ row =3D pg_row & 0xff; /* unsigned char iflag =3D mdb->pg_buf[ipg->offset]; */ @@ -856,7 +856,7 @@ mdb_copy_index_pg(MdbTableDef *table, MdbIndex *idx, Md= bIndexPage *ipg) } //mdb_put_int16(new_pg, mdb->fmt->row_count_offset, row); /* free space left */ - mdb_put_int16(new_pg, 2, mdb->fmt->pg_size - ipg->offset); + mdb_put_int16((char *)new_pg, 2, mdb->fmt->pg_size - ipg->offset); //printf("offset =3D %d\n", ipg->offset); = mdb_index_swap_n(idx_fields[0].value, col->col_size, key_hash); @@ -870,7 +870,7 @@ mdb_copy_index_pg(MdbTableDef *table, MdbIndex *idx, Md= bIndexPage *ipg) ((char *)new_pg)[ipg->offset] =3D 0x7f; memcpy((char*)new_pg + ipg->offset + 1, key_hash, col->col_size); pg_row =3D (pgnum << 8) | ((rownum-1) & 0xff); - mdb_put_int32_msb(new_pg, ipg->offset + 5, pg_row); + mdb_put_int32_msb((char *)new_pg, ipg->offset + 5, pg_row); ipg->idx_starts[row++] =3D ipg->offset + ipg->len; //ipg->idx_starts[row] =3D ipg->offset + ipg->len; if (mdb_get_option(MDB_DEBUG_WRITE)) {