diff options
| author | Taylor Blau <me@ttaylorr.com> | 2024-10-30 13:08:01 -0400 |
|---|---|---|
| committer | Taylor Blau <me@ttaylorr.com> | 2024-10-30 13:08:01 -0400 |
| commit | bc627658b06155a0b1c3d0b1b0bf72db70770dc9 (patch) | |
| tree | ddb335401e63360a7220dd087b55f62f04cc0987 /reftable/iter.c | |
| parent | 6a11438f43469f3815f2f0fc997bd45792ff04c0 (diff) | |
| parent | 20590cd287ada9c96efdf804e2bcdac0117c01b8 (diff) | |
| download | git-bc627658b06155a0b1c3d0b1b0bf72db70770dc9.tar.gz | |
Merge branch 'ps/reftable-strbuf'
Implements a new reftable-specific strbuf replacement to reduce
reftable's dependency on Git-specific data structures.
* ps/reftable-strbuf:
reftable: handle trivial `reftable_buf` errors
reftable/stack: adapt `stack_filename()` to handle allocation failures
reftable/record: adapt `reftable_record_key()` to handle allocation failures
reftable/stack: adapt `format_name()` to handle allocation failures
t/unit-tests: check for `reftable_buf` allocation errors
reftable/blocksource: adapt interface name
reftable: convert from `strbuf` to `reftable_buf`
reftable/basics: provide new `reftable_buf` interface
reftable: stop using `strbuf_addf()`
reftable: stop using `strbuf_addbuf()`
Diffstat (limited to 'reftable/iter.c')
| -rw-r--r-- | reftable/iter.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/reftable/iter.c b/reftable/iter.c index d926db653b..86e801ca9f 100644 --- a/reftable/iter.c +++ b/reftable/iter.c @@ -55,7 +55,7 @@ void iterator_set_empty(struct reftable_iterator *it) static void filtering_ref_iterator_close(void *iter_arg) { struct filtering_ref_iterator *fri = iter_arg; - strbuf_release(&fri->oid); + reftable_buf_release(&fri->oid); reftable_iterator_destroy(&fri->it); } @@ -115,7 +115,7 @@ static void indexed_table_ref_iter_close(void *p) block_iter_close(&it->cur); reftable_block_done(&it->block_reader.block); reftable_free(it->offsets); - strbuf_release(&it->oid); + reftable_buf_release(&it->oid); } static int indexed_table_ref_iter_next_block(struct indexed_table_ref_iter *it) @@ -197,7 +197,10 @@ int indexed_table_ref_iter_new(struct indexed_table_ref_iter **dest, *itr = empty; itr->r = r; - strbuf_add(&itr->oid, oid, oid_len); + + err = reftable_buf_add(&itr->oid, oid, oid_len); + if (err < 0) + goto out; itr->offsets = offsets; itr->offset_len = offset_len; |