From 52bb0476a8ad462c56b1d2c68b6d5f20f947ee50 Mon Sep 17 00:00:00 2001 From: Russell Belfer Date: Fri, 14 Mar 2014 13:53:15 -0700 Subject: Clean up index snapshot function naming Clear up some of the various "find" functions and the snapshot API naming to be things I like more. --- src/iterator.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/iterator.c') diff --git a/src/iterator.c b/src/iterator.c index 53ef278d1..63c14f962 100644 --- a/src/iterator.c +++ b/src/iterator.c @@ -820,7 +820,7 @@ static int index_iterator__reset( ii->current = 0; if (ii->base.start) - git_index__find_in_entries( + git_index_snapshot_find( &ii->current, &ii->entries, ii->entry_srch, ii->base.start, 0, 0); if ((ie = index_iterator__skip_conflicts(ii)) == NULL) @@ -846,9 +846,8 @@ static int index_iterator__reset( static void index_iterator__free(git_iterator *self) { index_iterator *ii = (index_iterator *)self; - git_index__release_snapshot(ii->index); + git_index_snapshot_release(&ii->entries, ii->index); ii->index = NULL; - git_vector_free(&ii->entries); git_buf_free(&ii->partial); } @@ -863,7 +862,7 @@ int git_iterator_for_index( index_iterator *ii = git__calloc(1, sizeof(index_iterator)); GITERR_CHECK_ALLOC(ii); - if ((error = git_index__snapshot(&ii->entries, index)) < 0) { + if ((error = git_index_snapshot_new(&ii->entries, index)) < 0) { git__free(ii); return error; } -- cgit v1.2.3