X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=diff.c;h=680b521a8bcab5355306ba6367d4c7f2cbd75f5c;hb=1a0756ffe4a4faf2dd70b36c36519d8530d98e7c;hp=f745cdd6e8bcd356c8b6f26accdd26b8b78be056;hpb=4130b99571903fb93e4c6e0d6677be7b6b986426;p=git.git diff --git a/diff.c b/diff.c index f745cdd6..680b521a 100644 --- a/diff.c +++ b/diff.c @@ -521,6 +521,13 @@ struct diff_filepair *diff_queue(struct diff_queue_struct *queue, return dp; } +void diff_free_filepair(struct diff_filepair *p) +{ + diff_free_filespec_data(p->one); + diff_free_filespec_data(p->two); + free(p); +} + static void diff_flush_raw(struct diff_filepair *p, int line_termination, int inter_name_termination) @@ -817,12 +824,8 @@ void diff_flush(int diff_output_style, int resolve_rename_copy) break; } } - for (i = 0; i < q->nr; i++) { - struct diff_filepair *p = q->queue[i]; - diff_free_filespec_data(p->one); - diff_free_filespec_data(p->two); - free(p); - } + for (i = 0; i < q->nr; i++) + diff_free_filepair(q->queue[i]); free(q->queue); q->queue = NULL; q->nr = q->alloc = 0;