lsm/mdbtools
1
0
Fork 0
mirror of https://github.com/mdbtools/mdbtools.git synced 2025-09-19 18:47:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix int/guint comparison warnings

Browse Source
This commit is contained in:
Nyall Dawson
2020-08-12 13:04:20 +10:00
parent ef3a9f99a8
commit 1639283779
6 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/mdbfakeglib.h
View File

@@ -41,7 +41,7 @@ typedef struct GString {
typedef struct GPtrArray { typedef struct GPtrArray {
void **pdata; void **pdata;
int len; guint len;
} GPtrArray; } GPtrArray;
typedef struct GList { typedef struct GList {

2
src/libmdb/catalog.c
View File

@@ -48,7 +48,7 @@ static char *type_name[] = {"Form",
void mdb_free_catalog(MdbHandle *mdb) void mdb_free_catalog(MdbHandle *mdb)
{ {
int i, j; guint i, j;
MdbCatalogEntry *entry; MdbCatalogEntry *entry;
if ((!mdb) || (!mdb->catalog)) return; if ((!mdb) || (!mdb->catalog)) return;

2
src/libmdb/index.c
View File

@@ -1132,7 +1132,7 @@ mdb_index_scan_free(MdbTableDef *table)
void mdb_free_indices(GPtrArray *indices) void mdb_free_indices(GPtrArray *indices)
{ {
int i; guint i;
if (!indices) return; if (!indices) return;
for (i=0; i<indices->len; i++) for (i=0; i<indices->len; i++)

3
src/libmdb/props.c
View File

@@ -89,7 +89,8 @@ mdb_read_props(MdbHandle *mdb, GPtrArray *names, gchar *kkd, int len)
{ {
guint32 record_len, name_len; guint32 record_len, name_len;
int pos = 0; int pos = 0;
int elem, dtype, dsize; guint elem;
int dtype, dsize;
gchar *name, *value; gchar *name, *value;
MdbProperties *props; MdbProperties *props;
int i=0; int i=0;

8
src/libmdb/table.c
View File

@@ -47,7 +47,7 @@ void mdb_free_tabledef(MdbTableDef *table)
{ {
if (!table) return; if (!table) return;
if (table->is_temp_table) { if (table->is_temp_table) {
int i; guint i;
/* Temp table pages are being stored in memory */ /* Temp table pages are being stored in memory */
for (i=0; i<table->temp_table_pages->len; i++) for (i=0; i<table->temp_table_pages->len; i++)
g_free(g_ptr_array_index(table->temp_table_pages,i)); g_free(g_ptr_array_index(table->temp_table_pages,i));
@@ -68,7 +68,7 @@ MdbTableDef *mdb_read_table(MdbCatalogEntry *entry)
MdbFormatConstants *fmt = mdb->fmt; MdbFormatConstants *fmt = mdb->fmt;
int row_start, pg_row; int row_start, pg_row;
void *buf, *pg_buf = mdb->pg_buf; void *buf, *pg_buf = mdb->pg_buf;
int i; guint i;
mdb_read_pg(mdb, entry->table_pg); mdb_read_pg(mdb, entry->table_pg);
if (mdb_get_byte(pg_buf, 0) != 0x02) /* not a valid table def page */ if (mdb_get_byte(pg_buf, 0) != 0x02) /* not a valid table def page */
@@ -198,7 +198,7 @@ void mdb_append_column(GPtrArray *columns, MdbColumn *in_col)
} }
void mdb_free_columns(GPtrArray *columns) void mdb_free_columns(GPtrArray *columns)
{ {
int i, j; guint i, j;
MdbColumn *col; MdbColumn *col;
if (!columns) return; if (!columns) return;
@@ -221,7 +221,7 @@ GPtrArray *mdb_read_columns(MdbTableDef *table)
MdbColumn *pcol; MdbColumn *pcol;
unsigned char *col; unsigned char *col;
unsigned int i; unsigned int i;
int j; guint j;
int cur_pos; int cur_pos;
size_t name_sz; size_t name_sz;
GPtrArray *allprops; GPtrArray *allprops;

2
src/util/mdb-prop.c
View File

@@ -92,7 +92,7 @@ main(int argc, char **argv)
void dump_kkd(MdbHandle *mdb, void *kkd, size_t len) void dump_kkd(MdbHandle *mdb, void *kkd, size_t len)
{ {
GPtrArray *aprops = mdb_kkd_to_props(mdb, kkd, len); GPtrArray *aprops = mdb_kkd_to_props(mdb, kkd, len);
int i; guint i;
if (!aprops) if (!aprops)
return; return;
for (i=0; i<aprops->len; ++i) { for (i=0; i<aprops->len; ++i) {