[PATCH v3 04/11] http.c: Drop useless != NULL test in finish_http_pack_request

From: Shawn O. Pearce <spearce@spearce.org>
Date: Apr 17, 2010, 20:07 UTC
Message-ID: <1271534864-31944-4-git-send-email-spearce@spearce.org>
In-Reply-To: <20100416100307.0000423f@unknown>

The test preq->packfile != NULL is always true. If packfile was actually NULL when entering this function the ftell() above would crash out with a SIGSEGV, resulting in never reaching this point.

Simplify the code by just removing the conditional.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
---
 http.c |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/http.c b/http.c
index 4558f11..64e0c18 100644
--- a/http.c
+++ b/http.c
@@ -1005,12 +1005,9 @@ int finish_http_pack_request(struct http_pack_request *preq)
 	struct packed_git *p = preq->target;
 
 	p->pack_size = ftell(preq->packfile);
-
-	if (preq->packfile != NULL) {
-		fclose(preq->packfile);
-		preq->packfile = NULL;
-		preq->slot->local = NULL;
-	}
+	fclose(preq->packfile);
+	preq->packfile = NULL;
+	preq->slot->local = NULL;
 
 	lst = preq->lst;
 	while (*lst != p)

-- 
1.7.1.rc1.269.ga27c7