summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2012-11-10 14:42:21 +0100
committerMichael Adam <obnox@samba.org>2012-11-29 17:52:34 +0100
commit664b170b13674c26c94ec1d3603570e707f8f1e5 (patch)
treef62aa65979f8a0e5d37d6dd21e535946edfdf9bd
parentaf608cdd8c6c2d5eaddcca90ccd8d075ddcb6c7e (diff)
downloadsamba-664b170b13674c26c94ec1d3603570e707f8f1e5.tar.gz
samba-664b170b13674c26c94ec1d3603570e707f8f1e5.tar.bz2
samba-664b170b13674c26c94ec1d3603570e707f8f1e5.zip
s3: Slightly simplify db_ctdb_marshall_loop_next
Both callers give a key argument Reviewed-by: Michael Adam <obnox@samba.org>
-rw-r--r--source3/lib/dbwrap/dbwrap_ctdb.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/source3/lib/dbwrap/dbwrap_ctdb.c b/source3/lib/dbwrap/dbwrap_ctdb.c
index 8a0f806e50..43b4b28d0d 100644
--- a/source3/lib/dbwrap/dbwrap_ctdb.c
+++ b/source3/lib/dbwrap/dbwrap_ctdb.c
@@ -339,10 +339,9 @@ static struct ctdb_rec_data *db_ctdb_marshall_loop_next(struct ctdb_marshall_buf
*reqid = r->reqid;
}
- if (key != NULL) {
- key->dptr = &r->data[0];
- key->dsize = r->keylen;
- }
+ key->dptr = &r->data[0];
+ key->dsize = r->keylen;
+
if (data != NULL) {
data->dptr = &r->data[r->keylen];
data->dsize = r->datalen;