[PATCH v7 06/38] rollback_lock_file(): set fd to -1
- From
Michael Haggerty <mhagger@alum.mit.edu>
- Date
- Oct 1, 2014, 10:28 UTC
- Message-ID
- <1412159322-2622-7-git-send-email-mhagger@alum.mit.edu>
- In-Reply-To
- <1412159322-2622-1-git-send-email-mhagger@alum.mit.edu>
When rolling back the lockfile, call close_lock_file() so that the lock_file's fd field gets set back to -1. This keeps the lock_file object in a valid state, which is important because these objects are allowed to be reused. It also makes it unnecessary to check whether the file has already been closed, because close_lock_file() takes care of that.
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> --- lockfile.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/lockfile.c b/lockfile.c index e55149a..3df1e83 100644 --- a/lockfile.c +++ b/lockfile.c @@ -279,8 +279,7 @@ void rollback_lock_file(struct lock_file *lk) if (!lk->filename[0]) return; - if (lk->fd >= 0) - close(lk->fd); + close_lock_file(lk); unlink_or_warn(lk->filename); lk->filename[0] = 0; }
-- 2.1.0