X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=diffcore-pickaxe.c;h=ea03b9107eb2e85dd4a4c5ad93ac08dfe7e1c9f0;hb=b3f01ff29f7131e959bcfdfd004744d74d5fa319;hp=84195e47aa0a0e2fbeeb8a56d255ff5c6f42efe7;hpb=b886656403ed26a9a78f73724c640a3149636ada;p=git.git

diff --git a/diffcore-pickaxe.c b/diffcore-pickaxe.c
index 84195e47a..ea03b9107 100644
--- a/diffcore-pickaxe.c
+++ b/diffcore-pickaxe.c
@@ -269,9 +269,8 @@ static void diffcore_pickaxe_count(struct diff_options *o)
 				diff_free_filepair(p);
 		}
 
-	if (opts & DIFF_PICKAXE_REGEX) {
+	if (opts & DIFF_PICKAXE_REGEX)
 		regfree(&regex);
-	}
 
 	free(q->queue);
 	*q = outq;
@@ -282,7 +281,7 @@ void diffcore_pickaxe(struct diff_options *o)
 {
 	/* Might want to warn when both S and G are on; I don't care... */
 	if (o->pickaxe_opts & DIFF_PICKAXE_KIND_G)
-		return diffcore_pickaxe_grep(o);
+		diffcore_pickaxe_grep(o);
 	else
-		return diffcore_pickaxe_count(o);
+		diffcore_pickaxe_count(o);
 }