Use _ convention everywhere: lock.c uses it already.

[ccan] / ccan / tdb / transaction.c

diff --git a/ccan/tdb/transaction.c b/ccan/tdb/transaction.c
index e55285f94cc6609a2afa720d39fe66d2261a36fe..7e8ac34dd5bc7e93a9a20cd9ac7e127716d3e504 100644 (file)
--- a/ccan/tdb/transaction.c
+++ b/ccan/tdb/transaction.c
@@ -455,7 +455,7 @@ static int transaction_sync(struct tdb_context *tdb, tdb_off_t offset, tdb_len_t
        return 0;
 }
 
        return 0;
 }
 

-int tdb_transaction_cancel_internal(struct tdb_context *tdb)
+int _tdb_transaction_cancel(struct tdb_context *tdb)

 {
        int i, ret = 0;
 
 {
        int i, ret = 0;
 


@@ -636,7 +636,7 @@ fail:
 int tdb_transaction_cancel(struct tdb_context *tdb)
 {      
        tdb_trace(tdb, "tdb_transaction_cancel");
 int tdb_transaction_cancel(struct tdb_context *tdb)
 {      
        tdb_trace(tdb, "tdb_transaction_cancel");

-       return tdb_transaction_cancel_internal(tdb);
+       return _tdb_transaction_cancel(tdb);

 }
 
 /*
 }
 
 /*


@@ -885,7 +885,7 @@ static int transaction_setup_recovery(struct tdb_context *tdb,
        return 0;
 }
 
        return 0;
 }
 

-static int tdb_transaction_prepare_commit_internal(struct tdb_context *tdb)
+static int _tdb_transaction_prepare_commit(struct tdb_context *tdb)

 {      
        const struct tdb_methods *methods;
 
 {      
        const struct tdb_methods *methods;
 


@@ -896,14 +896,14 @@ static int tdb_transaction_prepare_commit_internal(struct tdb_context *tdb)
 
        if (tdb->transaction->prepared) {
                tdb->ecode = TDB_ERR_EINVAL;
 
        if (tdb->transaction->prepared) {
                tdb->ecode = TDB_ERR_EINVAL;

-               tdb_transaction_cancel(tdb);
+               _tdb_transaction_cancel(tdb);

                TDB_LOG((tdb, TDB_DEBUG_ERROR, "tdb_transaction_prepare_commit: transaction already prepared\n"));
                return -1;
        }
 
        if (tdb->transaction->transaction_error) {
                tdb->ecode = TDB_ERR_IO;
                TDB_LOG((tdb, TDB_DEBUG_ERROR, "tdb_transaction_prepare_commit: transaction already prepared\n"));
                return -1;
        }
 
        if (tdb->transaction->transaction_error) {
                tdb->ecode = TDB_ERR_IO;

-               tdb_transaction_cancel_internal(tdb);
+               _tdb_transaction_cancel(tdb);

                TDB_LOG((tdb, TDB_DEBUG_ERROR, "tdb_transaction_prepare_commit: transaction error pending\n"));
                return -1;
        }
                TDB_LOG((tdb, TDB_DEBUG_ERROR, "tdb_transaction_prepare_commit: transaction error pending\n"));
                return -1;
        }


@@ -931,7 +931,7 @@ static int tdb_transaction_prepare_commit_internal(struct tdb_context *tdb)
        if (tdb->num_locks || tdb->global_lock.count) {
                tdb->ecode = TDB_ERR_LOCK;
                TDB_LOG((tdb, TDB_DEBUG_ERROR, "tdb_transaction_prepare_commit: locks pending on commit\n"));
        if (tdb->num_locks || tdb->global_lock.count) {
                tdb->ecode = TDB_ERR_LOCK;
                TDB_LOG((tdb, TDB_DEBUG_ERROR, "tdb_transaction_prepare_commit: locks pending on commit\n"));

-               tdb_transaction_cancel_internal(tdb);
+               _tdb_transaction_cancel(tdb);

                return -1;
        }
 
                return -1;
        }
 


@@ -939,7 +939,7 @@ static int tdb_transaction_prepare_commit_internal(struct tdb_context *tdb)
        if (tdb_brlock_upgrade(tdb, FREELIST_TOP, 0) == -1) {
                TDB_LOG((tdb, TDB_DEBUG_ERROR, "tdb_transaction_prepare_commit: failed to upgrade hash locks\n"));
                tdb->ecode = TDB_ERR_LOCK;
        if (tdb_brlock_upgrade(tdb, FREELIST_TOP, 0) == -1) {
                TDB_LOG((tdb, TDB_DEBUG_ERROR, "tdb_transaction_prepare_commit: failed to upgrade hash locks\n"));
                tdb->ecode = TDB_ERR_LOCK;

-               tdb_transaction_cancel_internal(tdb);
+               _tdb_transaction_cancel(tdb);

                return -1;
        }
 
                return -1;
        }
 


@@ -948,7 +948,7 @@ static int tdb_transaction_prepare_commit_internal(struct tdb_context *tdb)
        if (tdb_brlock(tdb, GLOBAL_LOCK, F_WRLCK, F_SETLKW, 0, 1) == -1) {
                TDB_LOG((tdb, TDB_DEBUG_ERROR, "tdb_transaction_prepare_commit: failed to get global lock\n"));
                tdb->ecode = TDB_ERR_LOCK;
        if (tdb_brlock(tdb, GLOBAL_LOCK, F_WRLCK, F_SETLKW, 0, 1) == -1) {
                TDB_LOG((tdb, TDB_DEBUG_ERROR, "tdb_transaction_prepare_commit: failed to get global lock\n"));
                tdb->ecode = TDB_ERR_LOCK;

-               tdb_transaction_cancel_internal(tdb);
+               _tdb_transaction_cancel(tdb);

                return -1;
        }
 
                return -1;
        }
 


@@ -957,7 +957,7 @@ static int tdb_transaction_prepare_commit_internal(struct tdb_context *tdb)
                if (transaction_setup_recovery(tdb, &tdb->transaction->magic_offset) == -1) {
                        TDB_LOG((tdb, TDB_DEBUG_FATAL, "tdb_transaction_prepare_commit: failed to setup recovery data\n"));
                        tdb_brlock(tdb, GLOBAL_LOCK, F_UNLCK, F_SETLKW, 0, 1);
                if (transaction_setup_recovery(tdb, &tdb->transaction->magic_offset) == -1) {
                        TDB_LOG((tdb, TDB_DEBUG_FATAL, "tdb_transaction_prepare_commit: failed to setup recovery data\n"));
                        tdb_brlock(tdb, GLOBAL_LOCK, F_UNLCK, F_SETLKW, 0, 1);

-                       tdb_transaction_cancel_internal(tdb);
+                       _tdb_transaction_cancel(tdb);

                        return -1;
                }
        }
                        return -1;
                }
        }


@@ -972,7 +972,7 @@ static int tdb_transaction_prepare_commit_internal(struct tdb_context *tdb)
                        tdb->ecode = TDB_ERR_IO;
                        TDB_LOG((tdb, TDB_DEBUG_FATAL, "tdb_transaction_prepare_commit: expansion failed\n"));
                        tdb_brlock(tdb, GLOBAL_LOCK, F_UNLCK, F_SETLKW, 0, 1);
                        tdb->ecode = TDB_ERR_IO;
                        TDB_LOG((tdb, TDB_DEBUG_FATAL, "tdb_transaction_prepare_commit: expansion failed\n"));
                        tdb_brlock(tdb, GLOBAL_LOCK, F_UNLCK, F_SETLKW, 0, 1);

-                       tdb_transaction_cancel_internal(tdb);
+                       _tdb_transaction_cancel(tdb);

                        return -1;
                }
                tdb->map_size = tdb->transaction->old_map_size;
                        return -1;
                }
                tdb->map_size = tdb->transaction->old_map_size;


@@ -990,7 +990,7 @@ static int tdb_transaction_prepare_commit_internal(struct tdb_context *tdb)
 int tdb_transaction_prepare_commit(struct tdb_context *tdb)
 {      
        tdb_trace(tdb, "tdb_transaction_prepare_commit");
 int tdb_transaction_prepare_commit(struct tdb_context *tdb)
 {      
        tdb_trace(tdb, "tdb_transaction_prepare_commit");

-       return tdb_transaction_prepare_commit_internal(tdb);
+       return _tdb_transaction_prepare_commit(tdb);

 }
 
 /*
 }
 
 /*


@@ -1030,12 +1030,12 @@ int tdb_transaction_commit(struct tdb_context *tdb)
 
        /* check for a null transaction */
        if (tdb->transaction->blocks == NULL) {
 
        /* check for a null transaction */
        if (tdb->transaction->blocks == NULL) {

-               tdb_transaction_cancel_internal(tdb);
+               _tdb_transaction_cancel(tdb);

                return 0;
        }
 
        if (!tdb->transaction->prepared) {
                return 0;
        }
 
        if (!tdb->transaction->prepared) {

-               int ret = tdb_transaction_prepare_commit_internal(tdb);
+               int ret = _tdb_transaction_prepare_commit(tdb);

                if (ret)
                        return ret;
        }
                if (ret)
                        return ret;
        }


@@ -1066,7 +1066,7 @@ int tdb_transaction_commit(struct tdb_context *tdb)
                        tdb->methods = methods;
                        tdb_transaction_recover(tdb); 
 
                        tdb->methods = methods;
                        tdb_transaction_recover(tdb); 
 

-                       tdb_transaction_cancel_internal(tdb);
+                       _tdb_transaction_cancel(tdb);

                        tdb_brlock(tdb, GLOBAL_LOCK, F_UNLCK, F_SETLKW, 0, 1);
 
                        TDB_LOG((tdb, TDB_DEBUG_FATAL, "tdb_transaction_commit: write failed\n"));
                        tdb_brlock(tdb, GLOBAL_LOCK, F_UNLCK, F_SETLKW, 0, 1);
 
                        TDB_LOG((tdb, TDB_DEBUG_FATAL, "tdb_transaction_commit: write failed\n"));


@@ -1104,7 +1104,7 @@ int tdb_transaction_commit(struct tdb_context *tdb)
 
        /* use a transaction cancel to free memory and remove the
           transaction locks */
 
        /* use a transaction cancel to free memory and remove the
           transaction locks */

-       tdb_transaction_cancel_internal(tdb);
+       _tdb_transaction_cancel(tdb);

 
        if (need_repack) {
                return tdb_repack(tdb);
 
        if (need_repack) {
                return tdb_repack(tdb);