X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=builtin-blame.c;h=9b4c02e87f7ef4a20d269ab9315b6977cf7fb3fb;hb=ea14e6c55427f50f78fe47187cd4edb9845943a1;hp=5466d01f9a5917dbba4108669ee4513b581ff2c9;hpb=cfa97ae141160486dbe8a786487bcaa965a160f0;p=git.git diff --git a/builtin-blame.c b/builtin-blame.c index 5466d01f9..9b4c02e87 100644 --- a/builtin-blame.c +++ b/builtin-blame.c @@ -125,7 +125,6 @@ static void origin_decref(struct origin *o) if (o && --o->refcnt <= 0) { if (o->file.ptr) free(o->file.ptr); - memset(o, 0, sizeof(*o)); free(o); } } @@ -542,7 +541,7 @@ static struct patch *compare_buffer(mmfile_t *file_p, mmfile_t *file_o, state.ret->chunks = NULL; state.ret->num = 0; - xdl_diff(file_p, file_o, &xpp, &xecfg, &ecb); + xdi_diff(file_p, file_o, &xpp, &xecfg, &ecb); if (state.ret->num) { struct chunk *chunk; @@ -607,7 +606,7 @@ static void add_blame_entry(struct scoreboard *sb, struct blame_entry *e) /* * src typically is on-stack; we want to copy the information in it to - * an malloced blame_entry that is already on the linked list of the + * a malloced blame_entry that is already on the linked list of the * scoreboard. The origin of dst loses a refcnt while the origin of src * gains one. */