diff options
| author | Russell Belfer <rb@github.com> | 2014-03-15 00:53:15 +0400 |
|---|---|---|
| committer | Russell Belfer <rb@github.com> | 2014-04-18 01:43:46 +0400 |
| commit | 52bb0476a8ad462c56b1d2c68b6d5f20f947ee50 (patch) | |
| tree | ed4e78ea3062c1b24a78bc82f86685a964fda77e /src/iterator.c | |
| parent | 8a2834d34173220c56bd1898397c0e6d200f327d (diff) | |
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.
Diffstat (limited to 'src/iterator.c')
| -rw-r--r-- | src/iterator.c | 7 |
1 files changed, 3 insertions, 4 deletions
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; } |