maint: use mbszero

* bootstrap.conf (gnulib_modules): Add mbszero.
* src/df.c (replace_invalid_chars):
* src/ls.c (quote_name_buf):
* src/pathchk.c (portable_chars_only):
* src/printf.c (STRTOX):
* src/wc.c (wc):
Prefer mbszero to clearing an mbstate_t by hand.

diff --git a/bootstrap.conf b/bootstrap.conf
index a15bda3417b45dc7c5852ec114e55be911645792..0b1ed95f632c65c656d076285d03d00201b2679e 100644 (file)
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -165,6 +165,7 @@ gnulib_modules="
   mbschr
   mbslen
   mbswidth
+  mbszero
   mcel-prefer
   memcasecmp
   memchr

diff --git a/src/df.c b/src/df.c
index c5eb820517f640abb46636c0afa1869cb2182fe5..1f3665a4af0e6d2b68ffcd260dd4b4bbf3b33865 100644 (file)
--- a/src/df.c
+++ b/src/df.c
@@ -319,7 +319,7 @@ replace_invalid_chars (char *cell)
 {
   char *srcend = cell + strlen (cell);
   char *dst = cell;
-  mbstate_t mbstate = {0};
+  mbstate_t mbstate; mbszero (&mbstate);
   size_t n;
 
   for (char *src = cell; src != srcend; src += n)

diff --git a/src/ls.c b/src/ls.c
index dfb7718f742d3204c8dfab023b179a5506a43dfc..eb74f16785e6935868280bb932482a6dee102357 100644 (file)
--- a/src/ls.c
+++ b/src/ls.c
@@ -4609,7 +4609,7 @@ quote_name_buf (char **inbuf, size_t bufsize, char *name,
                      reach its end, replacing each non-printable multibyte
                      character with a single question mark.  */
                   {
-                    mbstate_t mbstate = {0};
+                    mbstate_t mbstate; mbszero (&mbstate);
                     do
                       {
                         wchar_t wc;

diff --git a/src/pathchk.c b/src/pathchk.c
index 74ff1fa098b6e8b699b440cc7d3dc4880d8cb6c3..0e899140594a23803290fea99422d1d435feb2a7 100644 (file)
--- a/src/pathchk.c
+++ b/src/pathchk.c
@@ -188,7 +188,7 @@ portable_chars_only (char const *file, size_t filelen)
 
   if (*invalid)
     {
-      mbstate_t mbstate = {0};
+      mbstate_t mbstate; mbszero (&mbstate);
       size_t charlen = mbrlen (invalid, filelen - validlen, &mbstate);
       error (0, 0,
              _("non-portable character %s in file name %s"),

diff --git a/src/printf.c b/src/printf.c
index a6f63cb0053327202edf53173321db5d374bae85..16ea1c17f1955f9b55375a28832a6f0af935eb84 100644 (file)
--- a/src/printf.c
+++ b/src/printf.c
@@ -172,7 +172,7 @@ FUNC_NAME (char const *s)                                            \
                                                                          \
       if (MB_CUR_MAX > 1 && *(s + 1))                                   \
         {                                                               \
-          mbstate_t mbstate = {0};                                      \
+          mbstate_t mbstate; mbszero (&mbstate);                        \
           wchar_t wc;                                                   \
           size_t slen = strlen (s);                                     \
           ssize_t bytes;                                                \

diff --git a/src/wc.c b/src/wc.c
index 130be8c32c68c3b975d57f0161e770efb398d0ca..1753acfc1649aa3ed7d857c2b694d410b9ef14f9 100644 (file)
--- a/src/wc.c
+++ b/src/wc.c
@@ -452,7 +452,7 @@ wc (int fd, char const *file_x, struct fstatus *fstatus, off_t current_pos)
     {
       bool in_word = false;
       uintmax_t linepos = 0;
-      mbstate_t state = {0};
+      mbstate_t state; mbszero (&state);
       bool in_shift = false;
 # if SUPPORT_OLD_MBRTOWC
       /* Back-up the state before each multibyte character conversion and