From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 12 Feb 2024 21:16:10 +0000 (-0800)
Subject: Merge branch 'ps/reftable-styles'
X-Git-Tag: v2.44.0-rc1~16
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f424d7c33df373fb8eb4c9dc63ab6dc24de24aa5;p=thirdparty%2Fgit.git

Merge branch 'ps/reftable-styles'

Code clean-up in various reftable code paths.

* ps/reftable-styles:
  reftable/record: improve semantics when initializing records
  reftable/merged: refactor initialization of iterators
  reftable/merged: refactor seeking of records
  reftable/stack: use `size_t` to track stack length
  reftable/stack: use `size_t` to track stack slices during compaction
  reftable/stack: index segments with `size_t`
  reftable/stack: fix parameter validation when compacting range
  reftable: introduce macros to allocate arrays
  reftable: introduce macros to grow arrays
---

f424d7c33df373fb8eb4c9dc63ab6dc24de24aa5
diff --cc reftable/writer.c
index e23953e498,47b3448132..1d9ff0fbfa
--- a/reftable/writer.c
+++ b/reftable/writer.c
@@@ -121,11 -121,9 +121,10 @@@ static struct strbuf reftable_empty_str
  
  struct reftable_writer *
  reftable_new_writer(ssize_t (*writer_func)(void *, const void *, size_t),
 +		    int (*flush_func)(void *),
  		    void *writer_arg, struct reftable_write_options *opts)
  {
- 	struct reftable_writer *wp =
- 		reftable_calloc(sizeof(struct reftable_writer));
+ 	struct reftable_writer *wp = reftable_calloc(1, sizeof(*wp));
  	strbuf_init(&wp->block_writer_data.last_key, 0);
  	options_set_defaults(opts);
  	if (opts->block_size >= (1 << 24)) {