summaryrefslogtreecommitdiff
path: root/src/expand.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/expand.c
parentd035eacfdeba2da0134e606c8a63b2f3c0bd05bb (diff)
downloadcoreutils-492dcb2eb191b844a2fd5e51db3eed85289bea1f.tar.gz
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/expand.c')
-rw-r--r--src/expand.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/expand.c b/src/expand.c
index 9f84de825..9fa2e10aa 100644
--- a/src/expand.c
+++ b/src/expand.c
@@ -38,7 +38,7 @@
#include <getopt.h>
#include <sys/types.h>
#include "system.h"
-#include "error.h"
+#include "die.h"
#include "xstrndup.h"
#include "expand-common.h"
@@ -145,11 +145,11 @@ expand (void)
next_tab_column = column + 1;
if (next_tab_column < column)
- error (EXIT_FAILURE, 0, _("input line is too long"));
+ die (EXIT_FAILURE, 0, _("input line is too long"));
while (++column < next_tab_column)
if (putchar (' ') < 0)
- error (EXIT_FAILURE, errno, _("write error"));
+ die (EXIT_FAILURE, errno, _("write error"));
c = ' ';
}
@@ -164,7 +164,7 @@ expand (void)
{
column++;
if (!column)
- error (EXIT_FAILURE, 0, _("input line is too long"));
+ die (EXIT_FAILURE, 0, _("input line is too long"));
}
convert &= convert_entire_line || !! isblank (c);
@@ -174,7 +174,7 @@ expand (void)
return;
if (putchar (c) < 0)
- error (EXIT_FAILURE, errno, _("write error"));
+ die (EXIT_FAILURE, errno, _("write error"));
}
while (c != '\n');
}