Commit 80d647adc31e3c8721dc578140494f916463f623
2013-01-11T20:15:06
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.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61
diff --git a/src/indexer.c b/src/indexer.c
index 603c206..c1d5990 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 9779ecd..9d0c4c0 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 3490c8b..dcf9dd1 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 6c43d8f..db57e57 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,