diff options
author | Alex Riesen <raa.lkml@gmail.com> | 2009-04-29 23:22:56 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-04-29 18:37:41 -0700 |
commit | 691f1a28bf57618d8b44a193b1d28013c858aba6 (patch) | |
tree | 7d404656089320d486f658d3f4c061cd13dff556 /builtin-prune-packed.c | |
parent | fc71db39e0d75e8a403f36f3fecf4450886cd165 (diff) | |
download | git-691f1a28bf57618d8b44a193b1d28013c858aba6.tar.gz |
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>
Diffstat (limited to 'builtin-prune-packed.c')
-rw-r--r-- | builtin-prune-packed.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin-prune-packed.c b/builtin-prune-packed.c index 4942892e9f..00590b1c3c 100644 --- a/builtin-prune-packed.c +++ b/builtin-prune-packed.c @@ -28,8 +28,8 @@ static void prune_dir(int i, DIR *dir, char *pathname, int len, int opts) memcpy(pathname + len, de->d_name, 38); if (opts & DRY_RUN) printf("rm -f %s\n", pathname); - else if (unlink(pathname) < 0) - error("unable to unlink %s", pathname); + else + unlink_or_warn(pathname); display_progress(progress, i + 1); } pathname[len] = 0; |