diff options
| author | Pádraig Brady <P@draigBrady.com> | 2016-10-15 23:10:35 +0100 |
|---|---|---|
| committer | Pádraig Brady <P@draigBrady.com> | 2016-10-16 12:23:55 +0100 |
| commit | 492dcb2eb191b844a2fd5e51db3eed85289bea1f (patch) | |
| tree | 910f93d88891b573520ebd5c812d61ddc7fbeed8 /src/chcon.c | |
| parent | d035eacfdeba2da0134e606c8a63b2f3c0bd05bb (diff) | |
| download | coreutils-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/chcon.c')
| -rw-r--r-- | src/chcon.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/chcon.c b/src/chcon.c index 88bc53e19..b26cdf6c4 100644 --- a/src/chcon.c +++ b/src/chcon.c @@ -21,6 +21,7 @@ #include "system.h" #include "dev-ino.h" +#include "die.h" #include "error.h" #include "ignore-value.h" #include "quote.h" @@ -512,14 +513,14 @@ main (int argc, char **argv) if (bit_flags == FTS_PHYSICAL) { if (dereference == 1) - error (EXIT_FAILURE, 0, - _("-R --dereference requires either -H or -L")); + die (EXIT_FAILURE, 0, + _("-R --dereference requires either -H or -L")); affect_symlink_referent = false; } else { if (dereference == 0) - error (EXIT_FAILURE, 0, _("-R -h requires -P")); + die (EXIT_FAILURE, 0, _("-R -h requires -P")); affect_symlink_referent = true; } } @@ -543,8 +544,8 @@ main (int argc, char **argv) char *ref_context = NULL; if (getfilecon (reference_file, &ref_context) < 0) - error (EXIT_FAILURE, errno, _("failed to get security context of %s"), - quoteaf (reference_file)); + die (EXIT_FAILURE, errno, _("failed to get security context of %s"), + quoteaf (reference_file)); specified_context = ref_context; } @@ -557,8 +558,8 @@ main (int argc, char **argv) { specified_context = argv[optind++]; if (security_check_context (se_const (specified_context)) < 0) - error (EXIT_FAILURE, errno, _("invalid context: %s"), - quote (specified_context)); + die (EXIT_FAILURE, errno, _("invalid context: %s"), + quote (specified_context)); } if (reference_file && component_specified) @@ -572,8 +573,8 @@ main (int argc, char **argv) static struct dev_ino dev_ino_buf; root_dev_ino = get_root_dev_ino (&dev_ino_buf); if (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 ("/")); } else { |