Merge from gnulib (comment change only).

diff --git a/lib/strftime.c b/lib/strftime.c
index 213ced860dee010bbac8d6c99c9532239104c44a..c82d585bfa1570b2c4f97e266554d208737f0818 100644 (file)
--- a/lib/strftime.c
+++ b/lib/strftime.c
@@ -208,7 +208,14 @@ extern char *tzname[];
          else if (to_uppcase)                                                 \
            fwrite_uppcase (p, (s), _n);                                       \
          else                                                                 \
-           fwrite (s, _n, 1, p);                                              \
+           {                                                                  \
+             /* Ignore the value of fwrite.  The caller can determine whether \
+                an error occured by inspecting ferror (P).  All known fwrite  \
+                implementations set the stream's error indicator when they    \
+                fail due to ENOMEM etc., even though C11 and POSIX.1-2008 do  \
+                not require this.  */                                         \
+             fwrite (s, _n, 1, p);                                            \
+           }                                                                  \
        }                                                                      \
      while (0)                                                                \
     )