diff options
| author | Carlos Martín Nieto <cmn@dwim.me> | 2013-01-11 20:15:06 +0100 |
|---|---|---|
| committer | Carlos Martín Nieto <cmn@dwim.me> | 2013-01-11 20:17:21 +0100 |
| commit | 80d647adc31e3c8721dc578140494f916463f623 (patch) | |
| tree | 35f53ad25a93c3644b0d08622944462193cb5ec6 | |
| parent | 3f4437e714874ed10ce20fb32ca2dad3ca6f80ee (diff) | |
| download | libgit2-80d647adc31e3c8721dc578140494f916463f623.tar.gz | |
Revert "pack: packfile_free -> git_packfile_free and use it in the indexers"
This reverts commit f289f886cb81bb570bed747053d5ebf8aba6bef7, which
makes the tests fail on Windows. Revert until we can figure out a
solution.
| -rw-r--r-- | src/indexer.c | 4 | ||||
| -rw-r--r-- | src/odb_pack.c | 2 | ||||
| -rw-r--r-- | src/pack.c | 2 | ||||
| -rw-r--r-- | src/pack.h | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/indexer.c b/src/indexer.c index 603c20656..c1d599062 100644 --- a/src/indexer.c +++ b/src/indexer.c @@ -747,7 +747,7 @@ void git_indexer_stream_free(git_indexer_stream *idx) git_vector_foreach(&idx->deltas, i, delta) git__free(delta); git_vector_free(&idx->deltas); - git_packfile_free(idx->pack); + git__free(idx->pack); git__free(idx); } @@ -1059,7 +1059,7 @@ void git_indexer_free(git_indexer *idx) git_vector_foreach(&idx->pack->cache, i, pe) git__free(pe); git_vector_free(&idx->pack->cache); - git_packfile_free(idx->pack); + git__free(idx->pack); git__free(idx); } diff --git a/src/odb_pack.c b/src/odb_pack.c index 9779ecd25..9d0c4c0e7 100644 --- a/src/odb_pack.c +++ b/src/odb_pack.c @@ -538,7 +538,7 @@ static void pack_backend__free(git_odb_backend *_backend) for (i = 0; i < backend->packs.length; ++i) { struct git_pack_file *p = git_vector_get(&backend->packs, i); - git_packfile_free(p); + packfile_free(p); } git_vector_free(&backend->packs); diff --git a/src/pack.c b/src/pack.c index 3490c8bb9..dcf9dd178 100644 --- a/src/pack.c +++ b/src/pack.c @@ -794,7 +794,7 @@ static struct git_pack_file *packfile_alloc(size_t extra) } -void git_packfile_free(struct git_pack_file *p) +void packfile_free(struct git_pack_file *p) { assert(p); diff --git a/src/pack.h b/src/pack.h index 6c43d8f5b..db57e57d2 100644 --- a/src/pack.h +++ b/src/pack.h @@ -139,7 +139,7 @@ git_off_t get_delta_base(struct git_pack_file *p, git_mwindow **w_curs, git_off_t *curpos, git_otype type, git_off_t delta_obj_offset); -void git_packfile_free(struct git_pack_file *p); +void packfile_free(struct git_pack_file *p); int git_packfile_check(struct git_pack_file **pack_out, const char *path); int git_pack_entry_find( struct git_pack_entry *e, |
