[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH] fclose: preserve fflush errors
From: |
Eric Blake |
Subject: |
[PATCH] fclose: preserve fflush errors |
Date: |
Wed, 11 May 2011 11:39:22 -0600 |
Caught by gcc -Werror=unused-but-set-variable.
* lib/fclose.c (rpl_fclose): Don't lose fflush errors.
Reported by Jim Meyering.
Signed-off-by: Eric Blake <address@hidden>
---
ChangeLog | 4 ++++
lib/fclose.c | 12 ++++++------
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index f4d78dd..e8e37db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2011-05-11 Eric Blake <address@hidden>
+ fclose: preserve fflush errors
+ * lib/fclose.c (rpl_fclose): Don't lose fflush errors.
+ Reported by Jim Meyering.
+
bootstrap: support a prereq of 'rpcgen -' on RHEL5
* build-aux/bootstrap (check_versions): When no specific version
is required, merely check that the app produces an exit status
diff --git a/lib/fclose.c b/lib/fclose.c
index a8d68b4..c0dfa27 100644
--- a/lib/fclose.c
+++ b/lib/fclose.c
@@ -57,12 +57,6 @@ rpl_fclose (FILE *fp)
fclose (fp); /* will fail with errno = EBADF, if we did not lose a race */
- if (saved_errno != 0)
- {
- errno = saved_errno;
- result = EOF;
- }
-
#else /* !WINDOWS_SOCKETS */
/* Call fclose() and invoke all hooks of the overridden close(). */
@@ -80,5 +74,11 @@ rpl_fclose (FILE *fp)
#endif /* !WINDOWS_SOCKETS */
+ if (saved_errno != 0)
+ {
+ errno = saved_errno;
+ result = EOF;
+ }
+
return result;
}
--
1.7.4.4