From eca33373ce9bab460f06ab037746a8d71cf34ec6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?P=C3=A1draig=20Brady?= Date: Wed, 28 Jul 2021 23:16:02 +0100 Subject: [PATCH] maint: avoid syntax-check failures in recent ls changes * src/ls.c: Fix ifdef indenting and long line. --- src/ls.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/ls.c b/src/ls.c index 03ab2f797a..1047801e84 100644 --- a/src/ls.c +++ b/src/ls.c @@ -2273,18 +2273,18 @@ decode_switches (int argc, char **argv) if (linelen < 0) { /* Suppress bogus warning re comparing ws.ws_col to big integer. */ -# if __GNUC_PREREQ (4, 6) -# pragma GCC diagnostic push -# pragma GCC diagnostic ignored "-Wtype-limits" -# endif +# if __GNUC_PREREQ (4, 6) +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wtype-limits" +# endif struct winsize ws; if (stdout_isatty () && 0 <= ioctl (STDOUT_FILENO, TIOCGWINSZ, &ws) && 0 < ws.ws_col) linelen = ws.ws_col <= MIN (PTRDIFF_MAX, SIZE_MAX) ? ws.ws_col : 0; -# if __GNUC_PREREQ (4, 6) -# pragma GCC diagnostic pop -# endif +# if __GNUC_PREREQ (4, 6) +# pragma GCC diagnostic pop +# endif } #endif if (linelen < 0) @@ -5477,7 +5477,8 @@ Sort entries alphabetically if none of -cftuvSUX nor --sort is specified.\n\ \n\ "), stdout); fputs (_("\ - -k, --kibibytes default to 1024-byte blocks for file system usage;\n\ + -k, --kibibytes default to 1024-byte blocks for file system usage;\ +\n\ used only with -s and per directory totals\n\ "), stdout); fputs (_("\ -- 2.47.2