MonetDB: unlock - small compilation fixes

[Niels Nes]

Changeset: 0c3e37b9bbfc for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0c3e37b9bbfc
Modified Files:
        sql/storage/bat/bat_storage.c
Branch: unlock
Log Message:

small compilation fixes


diffs (71 lines):

diff --git a/sql/storage/bat/bat_storage.c b/sql/storage/bat/bat_storage.c
--- a/sql/storage/bat/bat_storage.c
+++ b/sql/storage/bat/bat_storage.c
@@ -567,6 +567,7 @@ delta_append_bat( sql_delta *bat, size_t
 {
        BAT *b;
 
+       (void)t;
        if (!BATcount(i))
                return LOG_OK;
        b = temp_descriptor(bat->cs.bid); /* TODO VIEW get parent */
@@ -617,6 +618,7 @@ delta_append_val( sql_delta *bat, size_t
 {
        BAT *b;
 
+       (void)t;
        b = temp_descriptor(bat->cs.bid); /* TODO VIEW get parent */
        if(b == NULL)
                return LOG_ERR;
@@ -867,7 +869,7 @@ delete_tab(sql_trans *tr, sql_table * t,
 }
 
 static int
-claim_cs(sql_trans *tr, column_storage *cs, size_t cnt) 
+claim_cs(column_storage *cs, size_t cnt) 
 {
        BAT *b = temp_descriptor(cs->bid);
 
@@ -875,7 +877,7 @@ claim_cs(sql_trans *tr, column_storage *
                return LOG_ERR;
        const void *nilptr = ATOMnilptr(b->ttype);
 
-       for(int i=0; i<cnt; i++){
+       for(size_t i=0; i<cnt; i++){
                if (BUNappend(b, nilptr, TRUE) != GDK_SUCCEED)
                        return LOG_ERR;
        }
@@ -897,7 +899,7 @@ table_claim_space(sql_trans *tr, sql_tab
 
                if (bind_col_data(tr, c) == LOG_ERR)
                        return LOG_ERR;
-               if (claim_cs(tr, c->data, cnt) == LOG_ERR)
+               if (claim_cs(c->data, cnt) == LOG_ERR)
                        return LOG_ERR;
        }
        if (t->idxs.set) {
@@ -908,7 +910,7 @@ table_claim_space(sql_trans *tr, sql_tab
                        if (isTable(ci->t) && idx_has_column(ci->type)) {
                                if (bind_idx_data(tr, ci) == LOG_ERR)
                                        return LOG_ERR;
-                               if (claim_cs(tr, ci->data, cnt) == LOG_ERR)
+                               if (claim_cs(ci->data, cnt) == LOG_ERR)
                                        return LOG_ERR;
                        }
                }
@@ -916,13 +918,13 @@ table_claim_space(sql_trans *tr, sql_tab
        return LOG_OK;
 }
 
-void
+static void
 lock_table(sqlid id)
 {
        MT_lock_set(&table_locks[id&(NR_TABLE_LOCKS-1)]);
 }
 
-void
+static void
 unlock_table(sqlid id)
 {
        MT_lock_unset(&table_locks[id&(NR_TABLE_LOCKS-1)]);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list