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/env.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/env.c') diff --git a/src/env.c b/src/env.c index 9994b2b83..e1f79d6c2 100644 --- a/src/env.c +++ b/src/env.c @@ -22,6 +22,7 @@ #include #include "system.h" +#include "die.h" #include "error.h" #include "quote.h" @@ -121,7 +122,7 @@ main (int argc, char **argv) optind = 0; /* Force GNU getopt to re-initialize. */ while ((optc = getopt_long (argc, argv, "+iu:0", longopts, NULL)) != -1) if (optc == 'u' && unsetenv (optarg)) - error (EXIT_CANCELED, errno, _("cannot unset %s"), quote (optarg)); + die (EXIT_CANCELED, errno, _("cannot unset %s"), quote (optarg)); if (optind < argc && STREQ (argv[optind], "-")) ++optind; @@ -132,8 +133,8 @@ main (int argc, char **argv) if (putenv (argv[optind])) { *eq = '\0'; - error (EXIT_CANCELED, errno, _("cannot set %s"), - quote (argv[optind])); + die (EXIT_CANCELED, errno, _("cannot set %s"), + quote (argv[optind])); } optind++; } -- cgit v1.2.3-54-g00ecf