Lots more gcc warnings fixes

src/libmdb/catalog.c

@@ -238,7 +238,7 @@ int next_pg, next_pg_off;
 void 
 mdb_dump_catalog(MdbHandle *mdb, int obj_type)
 {
-	int i;
+	unsigned int i;
 	MdbCatalogEntry *entry;
 
 	mdb_read_catalog(mdb, obj_type);

src/libmdb/data.c

@@ -54,7 +54,8 @@ MdbColumn *col;
 int
 mdb_bind_column_by_name(MdbTableDef *table, gchar *col_name, void *bind_ptr)
 {
-	int i, col_num = -1;
+	unsigned int i;
+	int col_num = -1;
 	MdbColumn *col;
 	
 	for (i=0;i<table->num_cols;i++) {
@@ -192,7 +193,8 @@ int mdb_read_row(MdbTableDef *table, int row)
 	MdbHandle *mdb = table->entry->mdb;
 	MdbFormatConstants *fmt = mdb->fmt;
 	MdbColumn *col;
-	int i, rc;
+	unsigned int i;
+	int rc;
 	//int num_cols, var_cols, fixed_cols;
 	int row_start, row_end;
 	//int fixed_cols_found, var_cols_found;
@@ -563,7 +565,7 @@ mdb_fetch_row(MdbTableDef *table)
 {
 	MdbHandle *mdb = table->entry->mdb;
 	MdbFormatConstants *fmt = mdb->fmt;
-	int rows;
+	unsigned int rows;
 	int rc;
 	guint32 pg;
 

src/libmdb/file.c

@@ -197,7 +197,7 @@ MdbHandle *mdb_clone_handle(MdbHandle *mdb)
 {
 	MdbHandle *newmdb;
 	MdbCatalogEntry *entry, *data;
-	int i;
+	unsigned int i;
 
 	newmdb = (MdbHandle *) g_memdup(mdb, sizeof(MdbHandle));
 	newmdb->stats = NULL;

src/libmdb/index.c

@@ -69,7 +69,7 @@ mdb_read_indices(MdbTableDef *table)
 	MdbHandle *mdb = entry->mdb;
 	MdbFormatConstants *fmt = mdb->fmt;
 	MdbIndex *pidx;
-	int i, j;
+	unsigned int i, j;
 	int idx_num, key_num, col_num;
 	int cur_pos, name_sz, idx2_sz, type_offset;
 	int index_start_pg = mdb->cur_pg;
@@ -827,7 +827,7 @@ int mdb_index_compute_cost(MdbTableDef *table, MdbIndex *idx)
 MdbStrategy 
 mdb_choose_index(MdbTableDef *table, int *choice)
 {
-	int i;
+	unsigned int i;
 	MdbIndex *idx;
 	int cost = 0;
 	int least = 99;

src/libmdb/sargs.c

@@ -259,8 +259,8 @@ MdbSarg *sarg;
 }
 int mdb_add_sarg_by_name(MdbTableDef *table, char *colname, MdbSarg *in_sarg)
 {
-MdbColumn *col;
-int i;
+	MdbColumn *col;
+	unsigned int i;
 
 	for (i=0;i<table->num_cols;i++) {
 		col = g_ptr_array_index (table->columns, i);

src/libmdb/table.c

@@ -207,7 +207,8 @@ GPtrArray *mdb_read_columns(MdbTableDef *table)
 	MdbFormatConstants *fmt = mdb->fmt;
 	MdbColumn *pcol;
 	unsigned char *col;
-	int i, cur_pos, name_sz;
+	unsigned int i;
+	int cur_pos, name_sz;
 	
 	table->columns = g_ptr_array_new();
 
@@ -311,7 +312,7 @@ MdbColumn *col;
 int coln;
 MdbIndex *idx;
 MdbHandle *mdb = entry->mdb;
-int i,bitn;
+unsigned int i, bitn;
 guint32 pgnum;
 
 	table = mdb_read_table(entry);

src/libmdb/write.c

@@ -76,8 +76,8 @@ mdb_write_pg(MdbHandle *mdb, unsigned long pg)
 static int 
 mdb_is_col_indexed(MdbTableDef *table, int colnum)
 {
-int i, j;
-MdbIndex *idx;
+	unsigned int i, j;
+	MdbIndex *idx;
 
 	for (i=0;i<table->num_idxs;i++) {
 		idx = g_ptr_array_index (table->indices, i);
@@ -93,7 +93,7 @@ mdb_crack_row4(MdbTableDef *table, int row_start, int row_end, MdbField *fields)
 	MdbCatalogEntry *entry = table->entry;
 	MdbHandle *mdb = entry->mdb;
 	MdbColumn *col;
-	int i;
+	unsigned int i;
 	int var_cols = 0, row_var_cols, fixed_cols = 0, row_fixed_cols, num_cols;
 	int var_cols_found, fixed_cols_found, var_entry_pos;
 	int col_start, next_col;
@@ -213,7 +213,7 @@ mdb_crack_row3(MdbTableDef *table, int row_start, int row_end, MdbField *fields)
 	MdbCatalogEntry *entry = table->entry;
 	MdbHandle *mdb = entry->mdb;
 	MdbColumn *col;
-	int i;
+	unsigned int i;
 	int var_cols = 0, fixed_cols = 0, num_cols;
 	int row_var_cols = 0, row_fixed_cols = 0;
 	int var_cols_found, fixed_cols_found, var_entry_pos;
@@ -439,7 +439,7 @@ mdb_pack_null_mask(unsigned char *buffer, int num_fields, MdbField *fields)
 /* fields must be ordered with fixed columns first, then vars, subsorted by 
  * column number */
 static int
-mdb_pack_row4(MdbTableDef *table, unsigned char *row_buffer, int num_fields, MdbField *fields)
+mdb_pack_row4(MdbTableDef *table, unsigned char *row_buffer, unsigned int num_fields, MdbField *fields)
 {
 	unsigned int pos = 0;
 	unsigned int var_cols = 0;
@@ -487,11 +487,11 @@ mdb_pack_row4(MdbTableDef *table, unsigned char *row_buffer, int num_fields, Mdb
 }
 
 static int
-mdb_pack_row3(MdbTableDef *table, unsigned char *row_buffer, int num_fields, MdbField *fields)
+mdb_pack_row3(MdbTableDef *table, unsigned char *row_buffer, unsigned int num_fields, MdbField *fields)
 {
 	unsigned int pos = 0;
 	unsigned int var_cols = 0;
-	int i;
+	unsigned int i;
 
 	row_buffer[pos++] = num_fields;
 
@@ -518,8 +518,8 @@ mdb_pack_row3(MdbTableDef *table, unsigned char *row_buffer, int num_fields, Mdb
 	row_buffer[pos] = pos;
 	pos++;
 
-	for (i=num_fields-1;i>=(int)(num_fields - var_cols);i--) {
-		row_buffer[pos++] = fields[i].offset % 256;
+	for (i=num_fields;i>num_fields-var_cols;i--) {
+		row_buffer[pos++] = fields[i-1].offset % 256;
 	}
 
 	row_buffer[pos++] = var_cols;
@@ -529,7 +529,7 @@ mdb_pack_row3(MdbTableDef *table, unsigned char *row_buffer, int num_fields, Mdb
 	return pos;
 }
 int
-mdb_pack_row(MdbTableDef *table, unsigned char *row_buffer, int num_fields, MdbField *fields)
+mdb_pack_row(MdbTableDef *table, unsigned char *row_buffer, int unsigned num_fields, MdbField *fields)
 {
 	if (IS_JET4(table->entry->mdb)) {
 		return mdb_pack_row4(table, row_buffer, num_fields, fields);
@@ -581,7 +581,7 @@ mdb_new_data_pg(MdbCatalogEntry *entry)
 int
 mdb_update_indexes(MdbTableDef *table, int num_fields, MdbField *fields, guint32 pgnum, guint16 rownum)
 {
-	int i;
+	unsigned int i;
 	MdbIndex *idx;
 	
 	for (i=0;i<table->num_idxs;i++) {
@@ -741,14 +741,15 @@ int
 mdb_update_row(MdbTableDef *table)
 {
 int row_start, row_end;
-int i;
+unsigned int i;
 MdbColumn *col;
 MdbCatalogEntry *entry = table->entry;
 MdbHandle *mdb = entry->mdb;
 MdbFormatConstants *fmt = mdb->fmt;
 MdbField fields[256];
 unsigned char row_buffer[4096];
-int old_row_size, new_row_size, delta, num_fields;
+int old_row_size, new_row_size, delta;
+unsigned int num_fields;
 
 	if (!mdb->f->writable) {
 		fprintf(stderr, "File is not open for writing\n");