threads / patch / 25350

patch, 2 partsdiffcore-pickaxe.c: remove unnecessary curly braces

Subject: [PATCH 1/2] diffcore-pickaxe.c: remove unnecessary curly braces

## tl;dr

2 messages between Oct 4, 2010 and Oct 4, 2010. Diffs are folded; open one to read it.

replies: 1people: 1as markdown or json

Brandon Casey· Oct 4, 2010, 22:51 UTC · lore

From: Brandon Casey <drafnel@gmail.com>

Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
---
 diffcore-pickaxe.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

Show changes to diffcore-pickaxe.c +1 −2

diff --git a/diffcore-pickaxe.c b/diffcore-pickaxe.c
index 84195e4..3857099 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;

-- 
1.7.3.1

Brandon Casey· Oct 4, 2010, 22:51 UTC · re: Brandon Casey · lore

[PATCH 2/2] diffcore-pickaxe.c: a void function shouldn't try to return something

From: Brandon Casey <drafnel@gmail.com>

Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
---
 diffcore-pickaxe.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Show changes to diffcore-pickaxe.c +2 −2

diff --git a/diffcore-pickaxe.c b/diffcore-pickaxe.c
index 3857099..ea03b91 100644
--- 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);
 }

-- 
1.7.3.1