From 492dcb2eb191b844a2fd5e51db3eed85289bea1f Mon Sep 17 00:00:00 2001 From: Pádraig Brady Date: Sat, 15 Oct 2016 23:10:35 +0100 Subject: 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, ...); --- src/rm.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/rm.c') 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; -- cgit v1.2.3-54-g00ecf