From dad7ab0b7b322a800e6b1012b777169169068388 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Tue, 4 Oct 2016 19:20:46 -0700 Subject: build: add die.h; avoid new warnings from GCC 7 * src/die.h (die): New file/function from grep. Note: we expect this file to migrate to gnulib. * src/csplit.c: Include die.h. (check_format_conv_type): Use die in place of error-nonzero;break; * src/install.c (strip): Likewise. * src/nl.c (proc_text): Likewise. This also suppresses a new warning from GCC 7's -Werror=strict-overflow. * src/tail.c (parse_options): Likewise. * src/basename.c (main): Adjust "fall through" comment so that GCC 7's -Wimplicit-fallthrough honors it. * src/cp.c (main): Add a "fall through" comment. * src/ls.c (gobble_file): Likewise. (get_funky_string): Adjust a "fall through" comment so it is recognized. * cfg.mk (exclude_file_name_regexp--sc_system_h_headers): Add die.h to this list of exempt src/*.h files. --- src/tail.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/tail.c') diff --git a/src/tail.c b/src/tail.c index 545da033c..4e98dd505 100644 --- a/src/tail.c +++ b/src/tail.c @@ -34,6 +34,7 @@ #include "system.h" #include "argmatch.h" #include "c-strtod.h" +#include "die.h" #include "error.h" #include "fcntl--.h" #include "isapipe.h" @@ -2161,8 +2162,7 @@ parse_options (int argc, char **argv, case '0': case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9': - error (EXIT_FAILURE, 0, - _("option used in invalid context -- %c"), c); + die (EXIT_FAILURE, 0, _("option used in invalid context -- %c"), c); default: usage (EXIT_FAILURE); -- cgit v1.2.3-54-g00ecf