summaryrefslogtreecommitdiff
path: root/src/rm.c
diff options
context:
space:
mode:
authorPádraig Brady <P@draigBrady.com>2016-10-15 23:10:35 +0100
committerPádraig Brady <P@draigBrady.com>2016-10-16 12:23:55 +0100
commit492dcb2eb191b844a2fd5e51db3eed85289bea1f (patch)
tree910f93d88891b573520ebd5c812d61ddc7fbeed8 /src/rm.c
parentd035eacfdeba2da0134e606c8a63b2f3c0bd05bb (diff)
downloadcoreutils-492dcb2eb191b844a2fd5e51db3eed85289bea1f.tar.xz
all: use die() rather than error(EXIT_FAILURE)
die() has the advantage of being apparent to the compiler that it doesn't return, which will avoid warnings in some cases, and possibly generate better code. * cfg.mk (sc_die_EXIT_FAILURE): A new syntax check rule to catch any new uses of error (CONSTANT, ...);
Diffstat (limited to 'src/rm.c')
-rw-r--r--src/rm.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/rm.c b/src/rm.c
index 2c54405f7..102bfe69e 100644
--- a/src/rm.c
+++ b/src/rm.c
@@ -26,6 +26,7 @@
#include "system.h"
#include "argmatch.h"
+#include "die.h"
#include "error.h"
#include "remove.h"
#include "root-dev-ino.h"
@@ -288,8 +289,8 @@ main (int argc, char **argv)
case NO_PRESERVE_ROOT:
if (! STREQ (argv[optind - 1], "--no-preserve-root"))
- error (EXIT_FAILURE, 0,
- _("you may not abbreviate the --no-preserve-root option"));
+ die (EXIT_FAILURE, 0,
+ _("you may not abbreviate the --no-preserve-root option"));
preserve_root = false;
break;
@@ -329,8 +330,8 @@ main (int argc, char **argv)
static struct dev_ino dev_ino_buf;
x.root_dev_ino = get_root_dev_ino (&dev_ino_buf);
if (x.root_dev_ino == NULL)
- error (EXIT_FAILURE, errno, _("failed to get attributes of %s"),
- quoteaf ("/"));
+ die (EXIT_FAILURE, errno, _("failed to get attributes of %s"),
+ quoteaf ("/"));
}
uintmax_t n_files = argc - optind;