Home » Mailing list archives » git » 2010 » April » 17

[PATCH v3 03/11] http.c: Tiny refactoring of finish_http_pack_request

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Shawn O. Pearce
Subject: [PATCH v3 03/11] http.c: Tiny refactoring of finish_http_pack_request
Date: Saturday, April 17, 2010 - 1:07 pm

Always remove the struct packed_git from the active list, even
if the rename of the temporary file fails.

While we are here, simplify the code a bit by using a common
local variable name ("p") to hold the relevant packed_git.

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

diff --git a/http.c b/http.c
index f26625e..4558f11 100644
--- a/http.c
+++ b/http.c
@@ -1002,8 +1002,9 @@ int finish_http_pack_request(struct http_pack_request *preq)
 {
 	int ret;
 	struct packed_git **lst;
+	struct packed_git *p = preq->target;
 
-	preq->target->pack_size = ftell(preq->packfile);
+	p->pack_size = ftell(preq->packfile);
 
 	if (preq->packfile != NULL) {
 		fclose(preq->packfile);
@@ -1011,18 +1012,17 @@ int finish_http_pack_request(struct http_pack_request *preq)
 		preq->slot->local = NULL;
 	}
 
-	ret = move_temp_to_file(preq->tmpfile, preq->filename);
-	if (ret)
-		return ret;
-
 	lst = preq->lst;
-	while (*lst != preq->target)
+	while (*lst != p)
 		lst = &((*lst)->next);
 	*lst = (*lst)->next;
 
-	if (verify_pack(preq->target))
+	ret = move_temp_to_file(preq->tmpfile, preq->filename);
+	if (ret)
+		return ret;
+	if (verify_pack(p))
 		return -1;
-	install_packed_git(preq->target);
+	install_packed_git(p);
 
 	return 0;
 }
-- 
1.7.1.rc1.269.ga27c7

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
git fetch over http:// left my repo broken, Christian Halstrick, (Thu Apr 15, 2:51 am)
Re: git fetch over http:// left my repo broken, Michael J Gruber, (Thu Apr 15, 2:58 am)
Re: git fetch over http:// left my repo broken, Ilari Liusvaara, (Thu Apr 15, 4:33 am)
Re: git fetch over http:// left my repo broken, Ilari Liusvaara, (Thu Apr 15, 4:43 am)
Re: git fetch over http:// left my repo broken, Shawn O. Pearce, (Thu Apr 15, 7:15 am)
[PATCH 0/6] detect dumb HTTP pack file corruption, Shawn O. Pearce, (Thu Apr 15, 12:09 pm)
[PATCH 1/6] http.c: Remove bad free of static block, Shawn O. Pearce, (Thu Apr 15, 12:09 pm)
[PATCH 2/6] t5550-http-fetch: Use subshell for repository ..., Shawn O. Pearce, (Thu Apr 15, 12:09 pm)
[PATCH 3/6] http.c: Tiny refactoring of finish_http_pack_r ..., Shawn O. Pearce, (Thu Apr 15, 12:09 pm)
[PATCH 4/6] http.c: Drop useless != NULL test in finish_ht ..., Shawn O. Pearce, (Thu Apr 15, 12:09 pm)
[PATCH 5/6] http-fetch: Use index-pack rather than verify- ..., Shawn O. Pearce, (Thu Apr 15, 12:09 pm)
[PATCH 6/6] http-fetch: Use temporary files for pack-*.idx ..., Shawn O. Pearce, (Thu Apr 15, 12:09 pm)
Re: [PATCH 5/6] http-fetch: Use index-pack rather than ver ..., Johannes Sixt, (Thu Apr 15, 12:34 pm)
[PATCH v2 5/6] http-fetch: Use index-pack rather than veri ..., Shawn O. Pearce, (Thu Apr 15, 2:25 pm)
[PATCH v2 6/6] http-fetch: Use temporary files for pack-*. ..., Shawn O. Pearce, (Thu Apr 15, 2:25 pm)
Re: [PATCH v2 6/6] http-fetch: Use temporary files for pac ..., Tay Ray Chuan, (Thu Apr 15, 7:03 pm)
Re: [PATCH v2 5/6] http-fetch: Use index-pack rather than ..., Tay Ray Chuan, (Thu Apr 15, 7:55 pm)
Re: [PATCH 0/6] detect dumb HTTP pack file corruption, Junio C Hamano, (Sat Apr 17, 10:56 am)
Re: [PATCH 0/6] detect dumb HTTP pack file corruption, Shawn O. Pearce, (Sat Apr 17, 12:11 pm)
Re: [PATCH v2 5/6] http-fetch: Use index-pack rather than ..., Shawn O. Pearce, (Sat Apr 17, 12:30 pm)
[PATCH v3 01/11] http.c: Remove bad free of static block, Shawn O. Pearce, (Sat Apr 17, 1:07 pm)
[PATCH v3 02/11] t5550-http-fetch: Use subshell for reposi ..., Shawn O. Pearce, (Sat Apr 17, 1:07 pm)
[PATCH v3 03/11] http.c: Tiny refactoring of finish_http_p ..., Shawn O. Pearce, (Sat Apr 17, 1:07 pm)
[PATCH v3 04/11] http.c: Drop useless != NULL test in fini ..., Shawn O. Pearce, (Sat Apr 17, 1:07 pm)
[PATCH v3 05/11] http.c: Don't store destination name in r ..., Shawn O. Pearce, (Sat Apr 17, 1:07 pm)
[PATCH v3 06/11] http.c: Remove unnecessary strdup of sha1 ..., Shawn O. Pearce, (Sat Apr 17, 1:07 pm)
[PATCH v3 07/11] Introduce close_pack_index to permit repl ..., Shawn O. Pearce, (Sat Apr 17, 1:07 pm)
[PATCH v3 08/11] Extract verify_pack_index for reuse from ..., Shawn O. Pearce, (Sat Apr 17, 1:07 pm)
[PATCH v3 09/11] Allow parse_pack_index on temporary files, Shawn O. Pearce, (Sat Apr 17, 1:07 pm)
[PATCH v3 10/11] http-fetch: Use index-pack rather than ve ..., Shawn O. Pearce, (Sat Apr 17, 1:07 pm)
[PATCH v3 11/11] http-fetch: Use temporary files for pack- ..., Shawn O. Pearce, (Sat Apr 17, 1:07 pm)
Re: [PATCH v3 10/11] http-fetch: Use index-pack rather tha ..., Tay Ray Chuan, (Sat Apr 17, 8:07 pm)
Re: [PATCH v3 06/11] http.c: Remove unnecessary strdup of ..., Tay Ray Chuan, (Sat Apr 17, 8:14 pm)
Re: [PATCH v3 05/11] http.c: Don't store destination name ..., Tay Ray Chuan, (Sat Apr 17, 8:36 pm)
Re: [PATCH v3 11/11] http-fetch: Use temporary files for p ..., Tay Ray Chuan, (Sat Apr 17, 8:57 pm)
[PATCH v4 00/11] Resend sp/maint-dumb-http-pack-reidx, Shawn O. Pearce, (Mon Apr 19, 7:23 am)
[PATCH v4 06/11] http.c: Remove unnecessary strdup of sha1 ..., Shawn O. Pearce, (Mon Apr 19, 7:23 am)
[PATCH v4 07/11] Introduce close_pack_index to permit repl ..., Shawn O. Pearce, (Mon Apr 19, 7:23 am)
[PATCH v4 08/11] Extract verify_pack_index for reuse from ..., Shawn O. Pearce, (Mon Apr 19, 7:23 am)
[PATCH v4 09/11] Allow parse_pack_index on temporary files, Shawn O. Pearce, (Mon Apr 19, 7:23 am)
[PATCH v4 10/11] http-fetch: Use index-pack rather than ve ..., Shawn O. Pearce, (Mon Apr 19, 7:23 am)
[PATCH v4 11/11] http-fetch: Use temporary files for pack- ..., Shawn O. Pearce, (Mon Apr 19, 7:23 am)
Re: [PATCH v4 10/11] http-fetch: Use index-pack rather tha ..., Tay Ray Chuan, (Mon Apr 19, 7:35 am)
Re: [PATCH v4 00/11] Resend sp/maint-dumb-http-pack-reidx, Tay Ray Chuan, (Mon Apr 19, 7:46 am)
Re: [PATCH v4 00/11] Resend sp/maint-dumb-http-pack-reidx, Shawn O. Pearce, (Mon Apr 19, 7:49 am)
Re: [PATCH v4 00/11] Resend sp/maint-dumb-http-pack-reidx, Tay Ray Chuan, (Mon Apr 19, 9:33 pm)