ctdb-tools: Simplify using tdb_storev
authorAmitay Isaacs <amitay@gmail.com>
Wed, 12 Oct 2016 04:41:25 +0000 (15:41 +1100)
committerJeremy Allison <jra@samba.org>
Thu, 27 Oct 2016 21:53:13 +0000 (23:53 +0200)
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
ctdb/tools/ltdbtool.c

index 23520796589ad94ccb37b4165a74dfaf99074152..e30309056f7ed22498106ec29f4b7b45c4c7718e 100644 (file)
@@ -332,18 +332,18 @@ static int write_record(TDB_CONTEXT* tdb, TDB_DATA key, TDB_DATA val,
                        return -1;
                }
        } else {
-               TDB_DATA h = {
-                       .dptr = (void*)hdr,
-                       .dsize = ctx->hsize,
-               };
-               if(tdb_store(ctx->tdb, key, h, ctx->tdb_store_flags) == -1) {
+               TDB_DATA rec[2];
+
+               rec[0].dsize = ctx->hsize;
+               rec[0].dptr = (uint8_t *)hdr;
+
+               rec[1].dsize = val.dsize;
+               rec[1].dptr = val.dptr;
+
+               if(tdb_storev(ctx->tdb, key, rec, 2, ctx->tdb_store_flags) == -1) {
                        fprintf(stderr, "tdb_store: %s\n", tdb_errorstr(ctx->tdb));
                        return -1;
                }
-               if(tdb_append(ctx->tdb, key, val) == -1) {
-                       fprintf(stderr, "tdb_append: %s\n", tdb_errorstr(ctx->tdb));
-                       return -1;
-               }
        }
        return 0;
 }