Merge pull request #10 from nyalldawson/guint_warn

Fix int/guint comparison warnings

include/mdbfakeglib.h

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

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;

src/libmdb/fakeglib.c

@@ -198,7 +198,7 @@ typedef struct MyNode {
 } MyNode;
 
 void *g_hash_table_lookup(GHashTable *table, const void *key) {
-    int i;
+    guint i;
     for (i=0; i<table->array->len; i++) {
         MyNode *node = g_ptr_array_index(table->array, i);
         if (table->compare(key, node->key))
@@ -209,7 +209,7 @@ void *g_hash_table_lookup(GHashTable *table, const void *key) {
 
 gboolean g_hash_table_lookup_extended (GHashTable *table, const void *lookup_key,
         void **orig_key, void **value) {
-    int i;
+    guint i;
     for (i=0; i<table->array->len; i++) {
         MyNode *node = g_ptr_array_index(table->array, i);
         if (table->compare(lookup_key, node->key)) {
@@ -230,7 +230,7 @@ void g_hash_table_insert(GHashTable *table, void *key, void *value) {
 
 gboolean g_hash_table_remove(GHashTable *table, gconstpointer key) {
     int found = 0;
-    for (int i=0; i<table->array->len; i++) {
+    for (guint i=0; i<table->array->len; i++) {
         MyNode *node = g_ptr_array_index(table->array, i);
         if (found) {
             table->array->pdata[i-1] = table->array->pdata[i];
@@ -252,7 +252,7 @@ GHashTable *g_hash_table_new(GHashFunc hashes, GEqualFunc equals) {
 }
 
 void g_hash_table_foreach(GHashTable *table, GHFunc function, void *data) {
-    int i;
+    guint i;
     for (i=0; i<table->array->len; i++) {
         MyNode *node = g_ptr_array_index(table->array, i);
         function(node->key, node->value, data);
@@ -260,7 +260,7 @@ void g_hash_table_foreach(GHashTable *table, GHFunc function, void *data) {
 }
 
 void g_hash_table_destroy(GHashTable *table) {
-    int i;
+    guint i;
     for (i=0; i<table->array->len; i++) {
         MyNode *node = g_ptr_array_index(table->array, i);
         free(node);
@@ -276,7 +276,7 @@ void g_ptr_array_sort(GPtrArray *array, GCompareFunc func) {
 }
 
 void g_ptr_array_foreach(GPtrArray *array, GFunc function, gpointer user_data) {
-    int i;
+    guint i;
     for (i=0; i<array->len; i++) {
         function(g_ptr_array_index(array, i), user_data);
     }
@@ -296,7 +296,7 @@ void g_ptr_array_add(GPtrArray *array, void *entry) {
 
 gboolean g_ptr_array_remove(GPtrArray *array, gpointer data) {
     int found = 0;
-    for (int i=0; i<array->len; i++) {
+    for (guint i=0; i<array->len; i++) {
         if (found) {
             array->pdata[i-1] = array->pdata[i];
         } else if (!found && array->pdata[i] == data) {

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++)

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;

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;

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) {