Avoid a compiler warning.

* src/pathchk.c (portable_chars_only): Initialize variable of type
mbstate_t via memset, rather than via '{0}'.  Patch from Bruno Haible.

diff --git a/ChangeLog b/ChangeLog
index 44002bd79919d46dd533ba0a03c939fe8987f3fa..0660bc06716f1af1d7472f1fdfaf0fbb8c19d708 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-10-09  Jim Meyering  <jim@meyering.net>
+
+       Avoid a compiler warning.
+       * src/pathchk.c (portable_chars_only): Initialize variable of type
+       mbstate_t via memset, rather than via '{0}'.  Patch from Bruno Haible.
+
 2006-10-06  Paul Eggert  <eggert@cs.ucla.edu>
 
        Fix bug reported today by Mike Frysinger: mkdir -pv is logging the

diff --git a/src/pathchk.c b/src/pathchk.c
index e4c0f448fbb819503de59aa6b89db427565186b8..04b46d8a8f8eb84716c05ff111f705f40453eaba 100644 (file)
--- a/src/pathchk.c
+++ b/src/pathchk.c
@@ -1,5 +1,5 @@
 /* pathchk -- check whether file names are valid or portable
-   Copyright (C) 1991-2005 Free Software Foundation, Inc.
+   Copyright (C) 1991-2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -200,8 +200,11 @@ portable_chars_only (char const *file, size_t filelen)
 
   if (*invalid)
     {
-      mbstate_t mbstate = {0};
-      size_t charlen = mbrlen (invalid, filelen - validlen, &mbstate);
+      mbstate_t mbstate;
+      size_t charlen;
+
+      memset (&mbstate, 0, sizeof mbstate);
+      charlen = mbrlen (invalid, filelen - validlen, &mbstate);
       error (0, 0,
             _("nonportable character %s in file name %s"),
             quotearg_n_style_mem (1, locale_quoting_style, invalid,