git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Guanqun Lu <guanqun.lu@gmail.com>
To: git@vger.kernel.org
Cc: Guanqun Lu <guanqun.lu@gmail.com>
Subject: [PATCH 2/2] lockfile: set lk->fd = -1 in 'rollback_lock_file()'
Date: Wed, 11 Feb 2009 14:43:32 +0800	[thread overview]
Message-ID: <1234334612-24907-2-git-send-email-guanqun.lu@gmail.com> (raw)
In-Reply-To: <1234334612-24907-1-git-send-email-guanqun.lu@gmail.com>

Post-conditions when these functions return successfully:
                    lk->fd == -1?    lk->filename[0] == '\0'?
close_lock_file()       yes                 no
commit_lock_file()      yes                 yes
rollback_lock_file()    no*                 yes

[*] This commit changes this 'no' in rollback_lock_file() to 'yes',
which achieves more robust and unified interface.

Signed-off-by: Guanqun Lu <guanqun.lu@gmail.com>
---
 lockfile.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/lockfile.c b/lockfile.c
index 021c337..44e5253 100644
--- a/lockfile.c
+++ b/lockfile.c
@@ -243,8 +243,10 @@ int commit_locked_index(struct lock_file *lk)
 void rollback_lock_file(struct lock_file *lk)
 {
 	if (lk->filename[0]) {
-		if (lk->fd >= 0)
+		if (lk->fd >= 0) {
 			close(lk->fd);
+			lk->fd = -1;
+		}
 		unlink(lk->filename);
 	}
 	lk->filename[0] = 0;
-- 
1.6.1.2.392.gb04d1

  parent reply	other threads:[~2009-02-10 14:41 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-02-11  6:43 [PATCH 1/2] code cleanup in sha1_file.c: xmalloc -> xcalloc Guanqun Lu
2009-02-10 16:29 ` Brandon Casey
2009-02-10 16:43 ` Junio C Hamano
2009-02-11  6:43 ` Guanqun Lu [this message]
2009-02-10 15:29   ` [PATCH 2/2] lockfile: set lk->fd = -1 in 'rollback_lock_file()' Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1234334612-24907-2-git-send-email-guanqun.lu@gmail.com \
    --to=guanqun.lu@gmail.com \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).