rollback_lock_file(): set fd to -1
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> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Michael Haggerty committed
Oct 1, 2014 at 12:28 UTC
26f5d3b65fa1b40be570a67f1aaca0e2f085d568
1 file changed
+1
-2
lockfile.c
+1
-2
@@ -279,8 +279,7 @@ void rollback_lock_file(struct lock_file *lk)
279
if (!lk->filename[0])
280
return;
281
282
- if (lk->fd >= 0)
283
- close(lk->fd);
282
+ close_lock_file(lk);
283
unlink_or_warn(lk->filename);
284
lk->filename[0] = 0;
285
}