X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=diffcore-pickaxe.c;h=9c6544daacb6d0c7aeb2cc188d089ee5aeb06c5d;hb=64f003abd9fbb155a6331365c0783b926185882c;hp=d0ef8397008824fb5139680856e3229ecf2c4eb1;hpb=4197195bee15f120e99d797b22108fd274235fd7;p=git.git diff --git a/diffcore-pickaxe.c b/diffcore-pickaxe.c index d0ef83970..9c6544daa 100644 --- a/diffcore-pickaxe.c +++ b/diffcore-pickaxe.c @@ -55,8 +55,7 @@ void diffcore_pickaxe(const char *needle, int opts) int i, has_changes; regex_t regex, *regexp = NULL; struct diff_queue_struct outq; - outq.queue = NULL; - outq.nr = outq.alloc = 0; + DIFF_QUEUE_CLEAR(&outq); if (opts & DIFF_PICKAXE_REGEX) { int err; @@ -129,9 +128,8 @@ void diffcore_pickaxe(const char *needle, int opts) diff_free_filepair(p); } - if (opts & DIFF_PICKAXE_REGEX) { + if (opts & DIFF_PICKAXE_REGEX) regfree(®ex); - } free(q->queue); *q = outq;