reftable: stop using `strbuf_addbuf()`

We're about to introduce our own `reftable_buf` type to replace
`strbuf`. Get rid of the seldomly-used `strbuf_addbuf()` function such
that we have to reimplement one less function.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Taylor Blau <me@ttaylorr.com>

diff --git a/reftable/block.c b/reftable/block.c
index 8d41a2f99eda76ecdc65819eab6fdf473edc8244..cd4180eac7bec709c948d66537166fddcd26c49e 100644 (file)
--- a/reftable/block.c
+++ b/reftable/block.c
@@ -60,7 +60,7 @@ static int block_writer_register_restart(struct block_writer *w, int n,
        w->next += n;
 
        strbuf_reset(&w->last_key);
-       strbuf_addbuf(&w->last_key, key);
+       strbuf_add(&w->last_key, key->buf, key->len);
        w->entries++;
        return 0;
 }

diff --git a/reftable/record.c b/reftable/record.c
index 30d563e16d31861a2c79d00397be8ab4ef3bffdb..87157f2c386508b966f3e9a3cfba6ee36d11bdb7 100644 (file)
--- a/reftable/record.c
+++ b/reftable/record.c
@@ -1031,7 +1031,7 @@ static void reftable_index_record_key(const void *r, struct strbuf *dest)
 {
        const struct reftable_index_record *rec = r;
        strbuf_reset(dest);
-       strbuf_addbuf(dest, &rec->last_key);
+       strbuf_add(dest, rec->last_key.buf, rec->last_key.len);
 }
 
 static int reftable_index_record_copy_from(void *rec, const void *src_rec,
@@ -1041,7 +1041,7 @@ static int reftable_index_record_copy_from(void *rec, const void *src_rec,
        const struct reftable_index_record *src = src_rec;
 
        strbuf_reset(&dst->last_key);
-       strbuf_addbuf(&dst->last_key, &src->last_key);
+       strbuf_add(&dst->last_key, src->last_key.buf, src->last_key.len);
        dst->offset = src->offset;
 
        return 0;
@@ -1085,7 +1085,7 @@ static int reftable_index_record_decode(void *rec, struct strbuf key,
        int n = 0;
 
        strbuf_reset(&r->last_key);
-       strbuf_addbuf(&r->last_key, &key);
+       strbuf_add(&r->last_key, key.buf, key.len);
 
        n = get_var_int(&r->offset, &in);
        if (n < 0)

diff --git a/reftable/writer.c b/reftable/writer.c
index b032a47decb8fe8e1ccd71c5cd4fbfaa30338a9a..031d8149a9cb64b2ba9be0fbbb203c80dec4a729 100644 (file)
--- a/reftable/writer.c
+++ b/reftable/writer.c
@@ -225,7 +225,7 @@ static int writer_index_hash(struct reftable_writer *w, struct strbuf *hash)
                *key = empty;
 
                strbuf_reset(&key->hash);
-               strbuf_addbuf(&key->hash, hash);
+               strbuf_add(&key->hash, hash->buf, hash->len);
                tree_insert(&w->obj_index_tree, key,
                            &obj_index_tree_node_compare);
        } else {
@@ -256,7 +256,7 @@ static int writer_add_record(struct reftable_writer *w,
        }
 
        strbuf_reset(&w->last_key);
-       strbuf_addbuf(&w->last_key, &key);
+       strbuf_add(&w->last_key, key.buf, key.len);
        if (!w->block_writer) {
                err = writer_reinit_block_writer(w, reftable_record_type(rec));
                if (err < 0)
@@ -778,7 +778,8 @@ static int writer_flush_nonempty_block(struct reftable_writer *w)
 
        index_record.offset = w->next;
        strbuf_reset(&index_record.last_key);
-       strbuf_addbuf(&index_record.last_key, &w->block_writer->last_key);
+       strbuf_add(&index_record.last_key, w->block_writer->last_key.buf,
+                  w->block_writer->last_key.len);
        w->index[w->index_len] = index_record;
        w->index_len++;