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/date.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'src/date.c') diff --git a/src/date.c b/src/date.c index 03968784f..9598fc6ea 100644 --- a/src/date.c +++ b/src/date.c @@ -26,6 +26,7 @@ #include "system.h" #include "argmatch.h" +#include "die.h" #include "error.h" #include "parse-datetime.h" #include "posixtm.h" @@ -301,7 +302,7 @@ batch_convert (const char *input_filename, const char *format, timezone_t tz) in_stream = fopen (input_filename, "r"); if (in_stream == NULL) { - error (EXIT_FAILURE, errno, "%s", quotef (input_filename)); + die (EXIT_FAILURE, errno, "%s", quotef (input_filename)); } } @@ -331,7 +332,7 @@ batch_convert (const char *input_filename, const char *format, timezone_t tz) } if (fclose (in_stream) == EOF) - error (EXIT_FAILURE, errno, "%s", quotef (input_filename)); + die (EXIT_FAILURE, errno, "%s", quotef (input_filename)); free (line); @@ -435,7 +436,7 @@ main (int argc, char **argv) if (new_format) { if (format) - error (EXIT_FAILURE, 0, _("multiple output formats specified")); + die (EXIT_FAILURE, 0, _("multiple output formats specified")); format = new_format; } } @@ -469,7 +470,7 @@ main (int argc, char **argv) if (argv[optind][0] == '+') { if (format) - error (EXIT_FAILURE, 0, _("multiple output formats specified")); + die (EXIT_FAILURE, 0, _("multiple output formats specified")); format = argv[optind++] + 1; } else if (set_date || option_specified_date) @@ -534,7 +535,7 @@ main (int argc, char **argv) if (reference != NULL) { if (stat (reference, &refstats) != 0) - error (EXIT_FAILURE, errno, "%s", quotef (reference)); + die (EXIT_FAILURE, errno, "%s", quotef (reference)); when = get_stat_mtime (&refstats); } else @@ -547,7 +548,7 @@ main (int argc, char **argv) } if (! valid_date) - error (EXIT_FAILURE, 0, _("invalid date %s"), quote (datestr)); + die (EXIT_FAILURE, 0, _("invalid date %s"), quote (datestr)); if (set_date) { -- cgit v1.2.3-54-g00ecf