Improve use of lockfile API

Remove remaining double close(2)'s.  i.e. close() before
commit_locked_index() or commit_lock_file().

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Brandon Casey
2008-01-16 13:12:46 -06:00
committed by Junio C Hamano
parent d6cf61bfd4
commit 4ed7cd3ab0
20 changed files with 54 additions and 45 deletions

View File

@ -246,8 +246,8 @@ int cmd_checkout_index(int argc, const char **argv, const char *prefix)
* want to update cache.
*/
if (state.refresh_cache) {
close(newfd); newfd = -1;
rollback_lock_file(&lock_file);
newfd = -1;
}
state.refresh_cache = 0;
}
@ -297,7 +297,7 @@ int cmd_checkout_index(int argc, const char **argv, const char *prefix)
if (0 <= newfd &&
(write_cache(newfd, active_cache, active_nr) ||
close(newfd) || commit_locked_index(&lock_file)))
commit_locked_index(&lock_file)))
die("Unable to write new index file");
return 0;
}