Skip to content

Commit 699de9c

Browse files
committed
iterator: remove duplicate memset
When allocating new tree iterator frames, we zero out the allocated memory twice. Remove one of the `memset` calls.
1 parent 9ca7a60 commit 699de9c

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

src/iterator.c

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -543,23 +543,21 @@ static int tree_iterator_frame_init(
543543
new_frame = git_array_alloc(iter->frames);
544544
GIT_ERROR_CHECK_ALLOC(new_frame);
545545

546-
memset(new_frame, 0, sizeof(tree_iterator_frame));
547-
548546
if ((error = git_tree_dup(&dup, tree)) < 0)
549547
goto done;
550548

551549
memset(new_frame, 0x0, sizeof(tree_iterator_frame));
552550
new_frame->tree = dup;
553551

554552
if (frame_entry &&
555-
(error = tree_iterator_compute_path(&new_frame->path, frame_entry)) < 0)
553+
(error = tree_iterator_compute_path(&new_frame->path, frame_entry)) < 0)
556554
goto done;
557555

558556
cmp = iterator__ignore_case(&iter->base) ?
559557
tree_iterator_entry_sort_icase : NULL;
560558

561-
if ((error = git_vector_init(
562-
&new_frame->entries, dup->entries.size, cmp)) < 0)
559+
if ((error = git_vector_init(&new_frame->entries,
560+
dup->entries.size, cmp)) < 0)
563561
goto done;
564562

565563
git_array_foreach(dup->entries, i, tree_entry) {

0 commit comments

Comments
 (0)