From 1639283779587b989f864038098cea3d83f45077 Mon Sep 17 00:00:00 2001
From: Nyall Dawson <nyall.dawson@gmail.com>
Date: Wed, 12 Aug 2020 13:04:20 +1000
Subject: [PATCH] Fix int/guint comparison warnings

---
 include/mdbfakeglib.h | 2 +-
 src/libmdb/catalog.c  | 2 +-
 src/libmdb/index.c    | 2 +-
 src/libmdb/props.c    | 3 ++-
 src/libmdb/table.c    | 8 ++++----
 src/util/mdb-prop.c   | 2 +-
 6 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/include/mdbfakeglib.h b/include/mdbfakeglib.h
index 980dddd..59b9a2d 100644
--- a/include/mdbfakeglib.h
+++ b/include/mdbfakeglib.h
@@ -41,7 +41,7 @@ typedef struct GString {
 
 typedef struct GPtrArray {
     void **pdata;
-    int len;
+    guint len;
 } GPtrArray;
 
 typedef struct GList {
diff --git a/src/libmdb/catalog.c b/src/libmdb/catalog.c
index af1dd4f..ca06c9c 100644
--- a/src/libmdb/catalog.c
+++ b/src/libmdb/catalog.c
@@ -48,7 +48,7 @@ static char *type_name[] = {"Form",
 
 void mdb_free_catalog(MdbHandle *mdb)
 {
-	int i, j;
+	guint i, j;
 	MdbCatalogEntry *entry;
 
 	if ((!mdb) || (!mdb->catalog)) return;
diff --git a/src/libmdb/index.c b/src/libmdb/index.c
index 803fcd0..4a4a264 100644
--- a/src/libmdb/index.c
+++ b/src/libmdb/index.c
@@ -1132,7 +1132,7 @@ mdb_index_scan_free(MdbTableDef *table)
 
 void mdb_free_indices(GPtrArray *indices)
 {
-	int i;
+	guint i;
 
 	if (!indices) return;
 	for (i=0; i<indices->len; i++)
diff --git a/src/libmdb/props.c b/src/libmdb/props.c
index 7532718..5151c88 100644
--- a/src/libmdb/props.c
+++ b/src/libmdb/props.c
@@ -89,7 +89,8 @@ mdb_read_props(MdbHandle *mdb, GPtrArray *names, gchar *kkd, int len)
 {
 	guint32 record_len, name_len;
 	int pos = 0;
-	int elem, dtype, dsize;
+	guint elem;
+	int dtype, dsize;
 	gchar *name, *value;
 	MdbProperties *props;
 	int i=0;
diff --git a/src/libmdb/table.c b/src/libmdb/table.c
index 1e2661c..7b262e1 100644
--- a/src/libmdb/table.c
+++ b/src/libmdb/table.c
@@ -47,7 +47,7 @@ void mdb_free_tabledef(MdbTableDef *table)
 {
 	if (!table) return;
 	if (table->is_temp_table) {
-		int i;
+		guint i;
 		/* Temp table pages are being stored in memory */
 		for (i=0; i<table->temp_table_pages->len; 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;
 	int row_start, pg_row;
 	void *buf, *pg_buf = mdb->pg_buf;
-	int i;
+	guint i;
 
 	mdb_read_pg(mdb, entry->table_pg);
 	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)
 {
-	int i, j;
+	guint i, j;
 	MdbColumn *col;
 
 	if (!columns) return;
@@ -221,7 +221,7 @@ GPtrArray *mdb_read_columns(MdbTableDef *table)
 	MdbColumn *pcol;
 	unsigned char *col;
 	unsigned int i;
-    int j;
+	guint j;
 	int cur_pos;
 	size_t name_sz;
 	GPtrArray *allprops;
diff --git a/src/util/mdb-prop.c b/src/util/mdb-prop.c
index a0a88bb..9e9dc24 100644
--- a/src/util/mdb-prop.c
+++ b/src/util/mdb-prop.c
@@ -92,7 +92,7 @@ main(int argc, char **argv)
 void dump_kkd(MdbHandle *mdb, void *kkd, size_t len)
 {
 	GPtrArray *aprops = mdb_kkd_to_props(mdb, kkd, len);
-	int i;
+	guint i;
 	if (!aprops)
 		return;
 	for (i=0; i<aprops->len; ++i) {