Merge branch 'refs/heads/t/sha3' into master

[osl.git] / osl.c

diff --git a/osl.c b/osl.c
index 8e19bc403ae79f1ff94ee7e0fafe04af8598e42a..9480325ea8ab3c81977bfd33c892e11f3b524eb9 100644 (file)
--- a/osl.c
+++ b/osl.c
@@ -997,12 +997,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 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;
 
        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);
                        return 0;
        }
        INFO_LOG("row %d is invalid\n", row_num);


@@ -1041,17 +1042,18 @@ int mark_row_invalid(struct osl_table *t, uint32_t row_num)
  */
 int init_rbtrees(struct osl_table *t)
 {
  */
 int init_rbtrees(struct osl_table *t)
 {

-       int i, ret;
+       int ret;
+       unsigned n;

        const struct osl_column_description *cd;
 
        /* create rbtrees */
        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;
        /* 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;
                struct osl_object *volatile_objs;

-               ret = row_is_invalid(t, i);
+               ret = row_is_invalid(t, n);

                if (ret < 0)
                        return ret;
                if (ret) {
                if (ret < 0)
                        return ret;
                if (ret) {


@@ -1065,7 +1067,7 @@ int init_rbtrees(struct osl_table *t)
                                return -E_OSL_NOMEM;
                } else
                        volatile_objs = NULL;
                                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;
        }
                if (ret < 0)
                        return ret;
        }