From: Paul Eggert <eggert@cs.ucla.edu>
Date: Fri, 4 Jan 2013 01:55:18 +0000 (+0000)
Subject: fprintftime: depend on stdio, not ignore-value
X-Git-Tag: v0.1~266
X-Git-Url: https://erislabs.net/gitweb/?a=commitdiff_plain;h=38a9c455b0a6ec223aa39bf4c2368afc690616ef;p=gnulib.git

fprintftime: depend on stdio, not ignore-value

* lib/strftime.c [FPRINTFTIME]: Do not include ignore-value.h.
(cpy) [FPRINTFTIME]: Use plain fwrite, not ignore_value of fwrite,
since the stdio module arranges to silence that warning now.
* modules/fprintftime (Depends-on): Depend on stdio, not ignore-value.
---

diff --git a/ChangeLog b/ChangeLog
index 8539bc969..ab35abd3c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2013-01-04  Paul Eggert  <eggert@cs.ucla.edu>
+
+	fprintftime: depend on stdio, not ignore-value
+	* lib/strftime.c [FPRINTFTIME]: Do not include ignore-value.h.
+	(cpy) [FPRINTFTIME]: Use plain fwrite, not ignore_value of fwrite,
+	since the stdio module arranges to silence that warning now.
+	* modules/fprintftime (Depends-on): Depend on stdio, not ignore-value.
+
 2012-10-04  Simon Josefsson  <simon@josefsson.org>
 
 	stdint-tests: Fix expanded-before-required-warning.
diff --git a/lib/strftime.c b/lib/strftime.c
index 1d58f2a16..213ced860 100644
--- a/lib/strftime.c
+++ b/lib/strftime.c
@@ -26,7 +26,6 @@
 #else
 # include <config.h>
 # if FPRINTFTIME
-#  include "ignore-value.h"
 #  include "fprintftime.h"
 # else
 #  include "strftime.h"
@@ -209,15 +208,7 @@ extern char *tzname[];
          else if (to_uppcase)                                                 \
            fwrite_uppcase (p, (s), _n);                                       \
          else                                                                 \
-           {                                                                  \
-             /* We are ignoring the value of fwrite here, in spite of the     \
-                fact that technically, that may not be valid: the fwrite      \
-                specification in POSIX 2008 defers to that of fputc, which    \
-                is intended to be consistent with the one from ISO C,         \
-                which permits failure due to ENOMEM *without* setting the     \
-                stream's error indicator.  */                                 \
-             ignore_value (fwrite ((s), _n, 1, p));                           \
-           }                                                                  \
+           fwrite (s, _n, 1, p);                                              \
        }                                                                      \
      while (0)                                                                \
     )
diff --git a/modules/fprintftime b/modules/fprintftime
index 54bba6335..f1c2b8ad7 100644
--- a/modules/fprintftime
+++ b/modules/fprintftime
@@ -6,7 +6,7 @@ lib/fprintftime.h
 lib/fprintftime.c
 
 Depends-on:
-ignore-value
+stdio
 strftime
 
 configure.ac: