Commit 3e0cf2a18057af11e7d8ba43bb43c4b399f89a27
2013-09-19T10:27:37
Stop being crazy about freeing memory
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 62 63
diff --git a/src/blame.c b/src/blame.c
index 30d65f0..33477d6 100644
--- a/src/blame.c
+++ b/src/blame.c
@@ -246,21 +246,6 @@ static git_blame_hunk* hunk_from_entry(struct blame_entry *e)
return h;
}
-static void free_if_not_already_freed(git_vector *already, struct origin *o)
-{
- size_t i;
-
- if (!o) return;
- if (!git_vector_search(&i, already, o))
- return;
-
- git_vector_insert(already, o);
- free_if_not_already_freed(already, o->previous);
- git_blob_free(o->blob);
- git_commit_free(o->commit);
- git__free(o);
-}
-
static int walk_and_mark(git_blame *blame)
{
int error;
@@ -269,7 +254,6 @@ static int walk_and_mark(git_blame *blame)
struct blame_entry *ent = NULL;
git_blob *blob = NULL;
struct origin *o;
- git_vector already = GIT_VECTOR_INIT;
if ((error = git_commit_lookup(&sb.final, blame->repository, &blame->options.newest_commit)) < 0 ||
(error = git_object_lookup_bypath((git_object**)&blob, (git_object*)sb.final, blame->path, GIT_OBJ_BLOB)) < 0)
@@ -289,26 +273,18 @@ static int walk_and_mark(git_blame *blame)
assign_blame(&sb, blame->options.flags);
coalesce(&sb);
- for (ent = sb.ent; ent; ) {
- git_vector_insert(&blame->hunks, hunk_from_entry(ent));
- ent = ent->next;
- }
-
cleanup:
for (ent = sb.ent; ent; ) {
struct blame_entry *e = ent->next;
struct origin *o = ent->suspect;
- /* Linkages might not be ordered, so we only free pointers we haven't
- * seen before. */
- free_if_not_already_freed(&already, o);
+ git_vector_insert(&blame->hunks, hunk_from_entry(ent));
+ origin_decref(o);
git__free(ent);
ent = e;
}
- git_vector_free(&already);
- git_commit_free(sb.final);
git_blob_free(blob);
return error;
}