diffcore-pickaxe.c: a void function shouldn't try to return something

drafnel · gitster · commit 8520913cc53e · 2010-10-06T13:45:18.000-07:00
Signed-off-by: Brandon Casey &lt;casey@nrlssc.navy.mil&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/diffcore-pickaxe.c b/diffcore-pickaxe.c
@@ -281,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);
 }

Original file line number	Diff line number	Diff line change
`@@ -281,7 +281,7 @@ void diffcore_pickaxe(struct diff_options *o)`
`281`	`281`	`{`
`282`	`282`	`/* Might want to warn when both S and G are on; I don't care... */`
`283`	`283`	`if (o->pickaxe_opts & DIFF_PICKAXE_KIND_G)`
`284`		`- return diffcore_pickaxe_grep(o);`
	`284`	`+ diffcore_pickaxe_grep(o);`
`285`	`285`	`else`
`286`		`- return diffcore_pickaxe_count(o);`
	`286`	`+ diffcore_pickaxe_count(o);`
`287`	`287`	`}`