[PATCH v3 03/11] http.c: Tiny refactoring of finish_http_pack_request
- From
Shawn O. Pearce <spearce@spearce.org>
- Date
- Apr 17, 2010, 20:07 UTC
- Message-ID
- <1271534864-31944-3-git-send-email-spearce@spearce.org>
- In-Reply-To
- <20100416100307.0000423f@unknown>
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