diff --git a/ChangeLog b/ChangeLog
index b35e56b..3535ba2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat Jul 17 09:21:13 CDT 2004	Jeff Smith <whydoubt@yahoo.com>
+	* include/mdbtools.h:
+	* src/libmdb/index.c:
+	* src/libmdb/write.c:
+	* src/util/prindex.c: Warnings fixes
+
 Sat Jul 17 02:47:16 CDT 2004	Jeff Smith <whydoubt@yahoo.com>
 	* include/mdbtools.h:
 	* src/libmdb/data.c:
diff --git a/include/mdbtools.h b/include/mdbtools.h
index 7f91670..8590372 100644
--- a/include/mdbtools.h
+++ b/include/mdbtools.h
@@ -260,7 +260,7 @@ typedef struct {
 	void	*bind_ptr;
 	int		*len_ptr;
 	GHashTable	*properties;
-	int		num_sargs;
+	unsigned int	num_sargs;
 	GPtrArray	*sargs;
 	GPtrArray	*idx_sarg_cache;
 	unsigned char   is_fixed;
@@ -353,7 +353,7 @@ struct mdbindex {
 	unsigned char	index_type;
 	guint32		first_pg;
 	int		num_rows;  /* number rows in index */
-	int		num_keys;
+	unsigned int	num_keys;
 	short	key_col_num[MDB_MAX_IDX_COLS];
 	unsigned char	key_col_order[MDB_MAX_IDX_COLS];
 	unsigned char	flags;
@@ -495,7 +495,7 @@ extern int mdb_like_cmp(char *s, char *r);
 /* write.c */
 extern int mdb_crack_row(MdbTableDef *table, int row_start, int row_end, MdbField *fields);
 extern guint16 mdb_add_row_to_pg(MdbTableDef *table, unsigned char *row_buffer, int new_row_size);
-extern int mdb_update_index(MdbTableDef *table, MdbIndex *idx, int num_fields, MdbField *fields, guint32 pgnum, guint16 rownum);
+extern int mdb_update_index(MdbTableDef *table, MdbIndex *idx, unsigned int num_fields, MdbField *fields, guint32 pgnum, guint16 rownum);
 extern int mdb_pack_row(MdbTableDef *table, unsigned char *row_buffer, unsigned int num_fields, MdbField *fields);
 extern int mdb_replace_row(MdbTableDef *table, int row, unsigned char *new_row, int new_row_size);
 extern int mdb_pg_get_freespace(MdbHandle *mdb);
diff --git a/src/libmdb/index.c b/src/libmdb/index.c
index 70659c3..ccc30a6 100644
--- a/src/libmdb/index.c
+++ b/src/libmdb/index.c
@@ -247,7 +247,7 @@ int lastchar;
 int
 mdb_index_test_sargs(MdbHandle *mdb, MdbIndex *idx, unsigned char *buf, int len)
 {
-	int i, j;
+	unsigned int i, j;
 	MdbColumn *col;
 	MdbTableDef *table = idx->table;
 	MdbSarg *idx_sarg;
@@ -686,7 +686,7 @@ MdbHandle *mdb = table->entry->mdb;
 int cur_pos = 0;
 unsigned char marker;
 MdbColumn *col;
-int i;
+unsigned int i;
 
 	if (idx->num_keys!=1) return;
 
@@ -702,7 +702,7 @@ int i;
 void 
 mdb_index_dump(MdbTableDef *table, MdbIndex *idx)
 {
-	int i;
+	unsigned int i;
 	MdbColumn *col;
 
 	fprintf(stdout,"index number     %d\n", idx->index_num);
@@ -731,7 +731,7 @@ mdb_index_dump(MdbTableDef *table, MdbIndex *idx)
  */
 int mdb_index_compute_cost(MdbTableDef *table, MdbIndex *idx)
 {
-	int i;
+	unsigned int i;
 	MdbColumn *col;
 	MdbSarg *sarg = NULL;
 	int not_all_equal = 0;
diff --git a/src/libmdb/write.c b/src/libmdb/write.c
index 6c8fbd2..02c4500 100644
--- a/src/libmdb/write.c
+++ b/src/libmdb/write.c
@@ -609,12 +609,12 @@ mdb_init_index_chain(MdbTableDef *table, MdbIndex *idx)
 }
 
 int
-mdb_update_index(MdbTableDef *table, MdbIndex *idx, int num_fields, MdbField *fields, guint32 pgnum, guint16 rownum)
+mdb_update_index(MdbTableDef *table, MdbIndex *idx, unsigned int num_fields, MdbField *fields, guint32 pgnum, guint16 rownum)
 {
 	MdbCatalogEntry *entry = table->entry;
 	MdbHandle *mdb = entry->mdb;
 	int idx_xref[16];
-	int i, j;
+	unsigned int i, j;
 	MdbIndexChain *chain;
 	MdbField idx_fields[10];
 
diff --git a/src/util/prindex.c b/src/util/prindex.c
index 0b37047..ac4730f 100644
--- a/src/util/prindex.c
+++ b/src/util/prindex.c
@@ -80,7 +80,7 @@ void check_row(MdbHandle *mdb, MdbIndex *idx, guint32 pg, int row, unsigned char
 {
 	MdbField fields[256];
 	MdbFormatConstants *fmt;
-	int num_fields, i, j;
+	unsigned int num_fields, i, j;
 	int row_start, row_end;
 	MdbColumn *col;
 	guchar buf[256], key[256];