From ab40a941a07d80326aaa051e3c94c88b800cbd7d Mon Sep 17 00:00:00 2001
From: Pádraig Brady <P@draigBrady.com>
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.
---
 gl/lib/randread.c   | 4 ++--
 gl/modules/randread | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'gl')

diff --git a/gl/lib/randread.c b/gl/lib/randread.c
index 5efbd4fe4..bd5e38650 100644
--- a/gl/lib/randread.c
+++ b/gl/lib/randread.c
@@ -28,7 +28,7 @@
 #include <error.h>
 #include <exitfail.h>
 #include <fcntl.h>
-#include <quotearg.h>
+#include <quote.h>
 #include <stdalign.h>
 #include <stdbool.h>
 #include <stdint.h>
@@ -126,7 +126,7 @@ randread_error (void const *file_name)
   if (file_name)
     error (exit_failure, errno,
            errno == 0 ? _("%s: end of file") : _("%s: read error"),
-           quotearg_colon (file_name));
+           quote (file_name));
   abort ();
 }
 
diff --git a/gl/modules/randread b/gl/modules/randread
index 14af00e7b..50e1e0eed 100644
--- a/gl/modules/randread
+++ b/gl/modules/randread
@@ -13,7 +13,7 @@ exitfail
 inline
 fopen-safer
 gettimeofday
-quotearg
+quote
 stdalign
 stdbool
 stdint
-- 
cgit v1.2.3-70-g09d2