X-Git-Url: http://git.tuebingen.mpg.de/?p=osl.git;a=blobdiff_plain;f=osl.c;h=17bddeb5db58b821931bd808f8ab0511ff78b3d9;hp=e31811b9c57eb0d897aee1c92c41b72cb35a97cc;hb=c2e27a85d7a7b8d4ce734c88f9ff1493b87a5789;hpb=7aa320514ebbb20f6c237627bf0bc8e509321f21

diff --git a/osl.c b/osl.c
index e31811b..17bddeb 100644
--- a/osl.c
+++ b/osl.c
@@ -1002,12 +1002,13 @@ __export int osl_close_table(struct osl_table *t, enum osl_close_flags flags)
 int row_is_invalid(struct osl_table *t, uint32_t row_num)
 {
 	char *row_index;
-	int i, ret = get_row_index(t, row_num, &row_index);
+	int ret = get_row_index(t, row_num, &row_index);
+	unsigned n;
 
 	if (ret < 0)
 		return ret;
-	for (i = 0; i < t->row_index_size; i++) {
-		if ((unsigned char)row_index[i] != 0xff)
+	for (n = 0; n < t->row_index_size; n++) {
+		if ((unsigned char)row_index[n] != 0xff)
 			return 0;
 	}
 	INFO_LOG("row %d is invalid\n", row_num);
@@ -1046,17 +1047,18 @@ int mark_row_invalid(struct osl_table *t, uint32_t row_num)
  */
 int init_rbtrees(struct osl_table *t)
 {
-	int i, ret;
+	int ret;
+	unsigned n;
 	const struct osl_column_description *cd;
 
 	/* create rbtrees */
-	FOR_EACH_RBTREE_COLUMN(i, t, cd)
-		t->columns[i].rbtree = RB_ROOT;
+	FOR_EACH_RBTREE_COLUMN(n, t, cd)
+		t->columns[n].rbtree = RB_ROOT;
 	/* add valid rows to rbtrees */
 	t->num_invalid_rows = 0;
-	for (i = 0; i < t->num_rows; i++) {
+	for (n = 0; n < t->num_rows; n++) {
 		struct osl_object *volatile_objs;
-		ret = row_is_invalid(t, i);
+		ret = row_is_invalid(t, n);
 		if (ret < 0)
 			return ret;
 		if (ret) {
@@ -1070,7 +1072,7 @@ int init_rbtrees(struct osl_table *t)
 				return -E_OSL_NOMEM;
 		} else
 			volatile_objs = NULL;
-		ret = add_row_to_rbtrees(t, i, volatile_objs, NULL);
+		ret = add_row_to_rbtrees(t, n, volatile_objs, NULL);
 		if (ret < 0)
 			return ret;
 	}