replace direct calls to unlink(2) with unlink_or_warn
This helps to notice when something's going wrong, especially on systems which lock open files. I used the following criteria when selecting the code for replacement: - it was already printing a warning for the unlink failures - it is in a function which already printing something or is called from such a function - it is in a static function, returning void and the function is only called from a builtin main function (cmd_) - it is in a function which handles emergency exit (signal handlers) - it is in a function which is obvously cleaning up the lockfiles Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
committed by
Junio C Hamano
parent
fc71db39e0
commit
691f1a28bf
@ -16,7 +16,7 @@ static void remove_lock_file(void)
|
||||
lock_file_list->filename[0]) {
|
||||
if (lock_file_list->fd >= 0)
|
||||
close(lock_file_list->fd);
|
||||
unlink(lock_file_list->filename);
|
||||
unlink_or_warn(lock_file_list->filename);
|
||||
}
|
||||
lock_file_list = lock_file_list->next;
|
||||
}
|
||||
@ -259,7 +259,7 @@ void rollback_lock_file(struct lock_file *lk)
|
||||
if (lk->filename[0]) {
|
||||
if (lk->fd >= 0)
|
||||
close(lk->fd);
|
||||
unlink(lk->filename);
|
||||
unlink_or_warn(lk->filename);
|
||||
}
|
||||
lk->filename[0] = 0;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user