diff options
| author | Volker Lendecke <vl@samba.org> | 2014-03-26 14:41:03 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2014-03-31 22:52:14 +0200 |
| commit | d6db35d7a564ee556b74131ef4c3a3cdb8097e14 (patch) | |
| tree | 1576430f97d46752b41efedbc8970d2eddf79f8e /source3/lib | |
| parent | f995c6e6d4bfe4a50ca0017c722bdfb329121958 (diff) | |
| download | samba-d6db35d7a564ee556b74131ef4c3a3cdb8097e14.tar.gz samba-d6db35d7a564ee556b74131ef4c3a3cdb8097e14.tar.xz samba-d6db35d7a564ee556b74131ef4c3a3cdb8097e14.zip | |
tdb_wrap: Remove tdb_wrap_open_ again
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'source3/lib')
| -rw-r--r-- | source3/lib/dbwrap/dbwrap_ctdb.c | 6 | ||||
| -rw-r--r-- | source3/lib/messages_local.c | 4 | ||||
| -rw-r--r-- | source3/lib/server_mutex.c | 14 | ||||
| -rw-r--r-- | source3/lib/serverid.c | 12 |
4 files changed, 18 insertions, 18 deletions
diff --git a/source3/lib/dbwrap/dbwrap_ctdb.c b/source3/lib/dbwrap/dbwrap_ctdb.c index 32d044628d1..7cf90cebdf8 100644 --- a/source3/lib/dbwrap/dbwrap_ctdb.c +++ b/source3/lib/dbwrap/dbwrap_ctdb.c @@ -1665,9 +1665,9 @@ struct db_context *db_open_ctdb(TALLOC_CTX *mem_ctx, hash_size = lpcfg_tdb_hash_size(lp_ctx, db_path); } - db_ctdb->wtdb = tdb_wrap_open_(db_ctdb, db_path, hash_size, - lpcfg_tdb_flags(lp_ctx, tdb_flags), - O_RDWR, 0); + db_ctdb->wtdb = tdb_wrap_open(db_ctdb, db_path, hash_size, + lpcfg_tdb_flags(lp_ctx, tdb_flags), + O_RDWR, 0); talloc_unlink(db_path, lp_ctx); if (db_ctdb->wtdb == NULL) { DEBUG(0, ("Could not open tdb %s: %s\n", db_path, strerror(errno))); diff --git a/source3/lib/messages_local.c b/source3/lib/messages_local.c index 1a3f3b27f24..1fe89c3bfaa 100644 --- a/source3/lib/messages_local.c +++ b/source3/lib/messages_local.c @@ -125,7 +125,7 @@ NTSTATUS messaging_tdb_init(struct messaging_context *msg_ctx, fname = lock_path("messages.tdb"); - ctx->tdb = tdb_wrap_open_( + ctx->tdb = tdb_wrap_open( ctx, fname, lpcfg_tdb_hash_size(lp_ctx, fname), lpcfg_tdb_flags(lp_ctx, TDB_CLEAR_IF_FIRST|TDB_DEFAULT| TDB_VOLATILE| TDB_INCOMPATIBLE_HASH), @@ -189,7 +189,7 @@ bool messaging_tdb_parent_init(TALLOC_CTX *mem_ctx) */ fname = lock_path("messages.tdb"); - db = tdb_wrap_open_( + db = tdb_wrap_open( mem_ctx, fname, lpcfg_tdb_hash_size(lp_ctx, fname), lpcfg_tdb_flags(lp_ctx, TDB_CLEAR_IF_FIRST|TDB_DEFAULT| TDB_VOLATILE|TDB_INCOMPATIBLE_HASH), diff --git a/source3/lib/server_mutex.c b/source3/lib/server_mutex.c index 24a301bde97..43cf77b94d9 100644 --- a/source3/lib/server_mutex.c +++ b/source3/lib/server_mutex.c @@ -72,13 +72,13 @@ struct named_mutex *grab_named_mutex(TALLOC_CTX *mem_ctx, const char *name, fname = lock_path("mutex.tdb"); - result->tdb = tdb_wrap_open_(result, fname, - lpcfg_tdb_hash_size(lp_ctx, fname), - lpcfg_tdb_flags(lp_ctx, - TDB_DEFAULT | - TDB_CLEAR_IF_FIRST | - TDB_INCOMPATIBLE_HASH), - O_RDWR|O_CREAT, 0600); + result->tdb = tdb_wrap_open(result, fname, + lpcfg_tdb_hash_size(lp_ctx, fname), + lpcfg_tdb_flags(lp_ctx, + TDB_DEFAULT | + TDB_CLEAR_IF_FIRST | + TDB_INCOMPATIBLE_HASH), + O_RDWR|O_CREAT, 0600); talloc_unlink(result, lp_ctx); if (result->tdb == NULL) { DEBUG(1, ("Could not open mutex.tdb: %s\n", diff --git a/source3/lib/serverid.c b/source3/lib/serverid.c index 4253da6378a..48b09f71f50 100644 --- a/source3/lib/serverid.c +++ b/source3/lib/serverid.c @@ -59,12 +59,12 @@ bool serverid_parent_init(TALLOC_CTX *mem_ctx) fname = lock_path("serverid.tdb"); - db = tdb_wrap_open_(mem_ctx, fname, - lpcfg_tdb_hash_size(lp_ctx, fname), - lpcfg_tdb_flags(lp_ctx, - TDB_DEFAULT|TDB_CLEAR_IF_FIRST| - TDB_INCOMPATIBLE_HASH), - O_RDWR|O_CREAT, 0644); + db = tdb_wrap_open(mem_ctx, fname, + lpcfg_tdb_hash_size(lp_ctx, fname), + lpcfg_tdb_flags(lp_ctx, + TDB_DEFAULT|TDB_CLEAR_IF_FIRST| + TDB_INCOMPATIBLE_HASH), + O_RDWR|O_CREAT, 0644); talloc_unlink(mem_ctx, lp_ctx); if (db == NULL) { DEBUG(1, ("could not open serverid.tdb: %s\n", |