Skip to content

Commit 3dd4fb1

Browse files
Chandra Pratapgitster
authored andcommitted
t-reftable-readwrite: use free_names() instead of a for loop
free_names() as defined by reftable/basics.{c,h} frees a NULL terminated array of malloced strings along with the array itself. Use this function instead of a for loop to free such an array. Mentored-by: Patrick Steinhardt <[email protected]> Mentored-by: Christian Couder <[email protected]> Signed-off-by: Chandra Pratap <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 5b539a5 commit 3dd4fb1

File tree

1 file changed

+3
-7
lines changed

1 file changed

+3
-7
lines changed

t/unit-tests/t-reftable-readwrite.c

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ license that can be found in the LICENSE file or at
77
*/
88

99
#include "test-lib.h"
10+
#include "reftable/basics.h"
1011
#include "reftable/blocksource.h"
1112
#include "reftable/reader.h"
1213
#include "reftable/reftable-error.h"
@@ -413,7 +414,6 @@ static void t_table_read_api(void)
413414
struct reftable_reader rd = { 0 };
414415
struct reftable_block_source source = { 0 };
415416
int err;
416-
int i;
417417
struct reftable_log_record log = { 0 };
418418
struct reftable_iterator it = { 0 };
419419

@@ -432,10 +432,8 @@ static void t_table_read_api(void)
432432
check_int(err, ==, REFTABLE_API_ERROR);
433433

434434
strbuf_release(&buf);
435-
for (i = 0; i < N; i++)
436-
reftable_free(names[i]);
435+
free_names(names);
437436
reftable_iterator_destroy(&it);
438-
reftable_free(names);
439437
reader_close(&rd);
440438
strbuf_release(&buf);
441439
}
@@ -498,9 +496,7 @@ static void t_table_read_write_seek(int index, int hash_id)
498496
reftable_iterator_destroy(&it);
499497

500498
strbuf_release(&buf);
501-
for (i = 0; i < N; i++)
502-
reftable_free(names[i]);
503-
reftable_free(names);
499+
free_names(names);
504500
reader_close(&rd);
505501
}
506502

0 commit comments

Comments
 (0)