proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-06-26 19:43:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Stop being crazy about freeing memory

Browse Source
This commit is contained in:
Ben Straub 2013-09-19 10:27:37 -07:00
parent 0afe999648
commit 3e0cf2a180
1 changed files with 2 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/blame.c
View File

@ -246,21 +246,6 @@ static git_blame_hunk* hunk_from_entry(struct blame_entry *e)
return h; 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) static int walk_and_mark(git_blame *blame)
{ {
int error; int error;
@ -269,7 +254,6 @@ static int walk_and_mark(git_blame *blame)
struct blame_entry *ent = NULL; struct blame_entry *ent = NULL;
git_blob *blob = NULL; git_blob *blob = NULL;
struct origin *o; struct origin *o;
git_vector already = GIT_VECTOR_INIT;
if ((error = git_commit_lookup(&sb.final, blame->repository, &blame->options.newest_commit)) < 0 || 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) (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); assign_blame(&sb, blame->options.flags);
coalesce(&sb); coalesce(&sb);
for (ent = sb.ent; ent; ) {
git_vector_insert(&blame->hunks, hunk_from_entry(ent));
ent = ent->next;
}
cleanup: cleanup:
for (ent = sb.ent; ent; ) { for (ent = sb.ent; ent; ) {
struct blame_entry *e = ent->next; struct blame_entry *e = ent->next;
struct origin *o = ent->suspect; struct origin *o = ent->suspect;
/* Linkages might not be ordered, so we only free pointers we haven't git_vector_insert(&blame->hunks, hunk_from_entry(ent));
* seen before. */
free_if_not_already_freed(&already, o);
origin_decref(o);
git__free(ent); git__free(ent);
ent = e; ent = e;
} }
git_vector_free(&already);
git_commit_free(sb.final);
git_blob_free(blob); git_blob_free(blob);
return error; return error;
} }