From ab40a941a07d80326aaa051e3c94c88b800cbd7d Mon Sep 17 00:00:00 2001 From: Pádraig Brady Date: Wed, 28 Oct 2015 13:02:31 +0000 Subject: all: replace most uses of quotearg_colon() with quote() Related to commit v8.24-61-g6796698 this provides more consistent quoting, as quotearg_colon() defaults to "literal" quoting by default, while quote() provides appropriate quoting for diagnostics by default. * gl/modules/randread: Depend on quote module rather than quotearg. * gl/lib/randread.c: Used quote() not quotearg_colon(). * src/: Likewise. * src/shred.c: Likewise. Also avoid unnecessary quoting introducing overhead when wiping names. * cfg.mk: Relax the matching expression to allow "qname" variables as used in shred.c to satisfy the check. * tests/: Adjust accordingly. --- src/stat.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/stat.c') diff --git a/src/stat.c b/src/stat.c index 680a598f0..a8a8c9d64 100644 --- a/src/stat.c +++ b/src/stat.c @@ -66,7 +66,6 @@ #include "getopt.h" #include "mountlist.h" #include "quote.h" -#include "quotearg.h" #include "stat-size.h" #include "stat-time.h" #include "strftime.h" @@ -1188,7 +1187,7 @@ print_it (char const *format, int fd, char const *filename, dest[len + 1] = *fmt_char; dest[len + 2] = '\0'; error (EXIT_FAILURE, 0, _("%s: invalid directive"), - quotearg_colon (dest)); + quote (dest)); } putchar ('%'); break; -- cgit v1.2.3-54-g00ecf