summaryrefslogtreecommitdiffstats
path: root/ctdb
diff options
context:
space:
mode:
authorAmitay Isaacs <amitay@gmail.com>2014-07-14 16:30:18 +1000
committerVolker Lendecke <vl@samba.org>2014-07-14 16:01:31 +0200
commit208b2d88c4efacee79fe4d856ee8256c680cad5c (patch)
tree0b844274873c4eebc6105bcbf33de84217485807 /ctdb
parent02bcdd109fb24a369c05dceabfdc1b5edd291aeb (diff)
downloadsamba-208b2d88c4efacee79fe4d856ee8256c680cad5c.tar.gz
samba-208b2d88c4efacee79fe4d856ee8256c680cad5c.tar.xz
samba-208b2d88c4efacee79fe4d856ee8256c680cad5c.zip
ctdb-ltdb: Use tdb_null instead of zeroing TDB_DATA variable
Signed-off-by: Amitay Isaacs <amitay@gmail.com> Reviewed-by: Volker Lendecke <vl@samba.org> Autobuild-User(master): Volker Lendecke <vl@samba.org> Autobuild-Date(master): Mon Jul 14 16:01:31 CEST 2014 on sn-devel-104
Diffstat (limited to 'ctdb')
-rw-r--r--ctdb/common/ctdb_ltdb.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/ctdb/common/ctdb_ltdb.c b/ctdb/common/ctdb_ltdb.c
index 500f7211df..103d89bf2b 100644
--- a/ctdb/common/ctdb_ltdb.c
+++ b/ctdb/common/ctdb_ltdb.c
@@ -83,7 +83,6 @@ int ctdb_ltdb_fetch(struct ctdb_db_context *ctdb_db,
rec = tdb_fetch(ctdb_db->ltdb->tdb, key);
if (rec.dsize < sizeof(*header)) {
- TDB_DATA d2;
/* return an initial header */
if (rec.dptr) free(rec.dptr);
if (ctdb->vnn_map == NULL) {
@@ -93,12 +92,11 @@ int ctdb_ltdb_fetch(struct ctdb_db_context *ctdb_db,
return -1;
}
ltdb_initial_header(ctdb_db, key, header);
- ZERO_STRUCT(d2);
if (data) {
- *data = d2;
+ *data = tdb_null;
}
if (ctdb_db->persistent || header->dmaster == ctdb_db->ctdb->pnn) {
- if (ctdb_ltdb_store(ctdb_db, key, header, d2) != 0) {
+ if (ctdb_ltdb_store(ctdb_db, key, header, tdb_null) != 0) {
DEBUG(DEBUG_NOTICE,
(__location__ "failed to store initial header\n"));
}