diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2013-01-04 01:55:18 +0000 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2013-01-03 18:05:35 -0800 |
| commit | 38a9c455b0a6ec223aa39bf4c2368afc690616ef (patch) | |
| tree | c76aada1179fac0293a0982508097ab60bda0875 | |
| parent | ff900756421975ed39a5611f63655451ef5e5728 (diff) | |
| download | gnulib-38a9c455b0a6ec223aa39bf4c2368afc690616ef.tar.gz | |
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.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | lib/strftime.c | 11 | ||||
| -rw-r--r-- | modules/fprintftime | 2 |
3 files changed, 10 insertions, 11 deletions
@@ -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 1d58f2a160..213ced860d 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 54bba63359..f1c2b8ad76 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: |