summaryrefslogtreecommitdiff
path: root/src/ls.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/ls.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/ls.c')
-rw-r--r--src/ls.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/ls.c b/src/ls.c
index 4d6e6478c..cb3811163 100644
--- a/src/ls.c
+++ b/src/ls.c
@@ -87,6 +87,7 @@
#include "acl.h"
#include "argmatch.h"
#include "dev-ino.h"
+#include "die.h"
#include "error.h"
#include "filenamecat.h"
#include "hard-locale.h"
@@ -1843,8 +1844,8 @@ decode_switches (int argc, char **argv)
case 'w':
if (! set_line_length (optarg))
- error (LS_FAILURE, 0, "%s: %s", _("invalid line width"),
- quote (optarg));
+ die (LS_FAILURE, 0, "%s: %s", _("invalid line width"),
+ quote (optarg));
break;
case 'x':
@@ -2122,8 +2123,8 @@ decode_switches (int argc, char **argv)
else
{
if (strchr (p1 + 1, '\n'))
- error (LS_FAILURE, 0, _("invalid time style format %s"),
- quote (p0));
+ die (LS_FAILURE, 0, _("invalid time style format %s"),
+ quote (p0));
*p1++ = '\0';
}
long_time_format[0] = p0;