summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68>2006-02-15 18:45:14 +0000
committerwrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68>2006-02-15 18:45:14 +0000
commit2d2b1f7943c478b5dfafd841ba8ac07f30c65b47 (patch)
treeeada8f8118b901da784aef7e719f95d7c7b9f790
parente68317690fbfafde2e68c2a7037bad9bbe60427b (diff)
downloadlibapr-2d2b1f7943c478b5dfafd841ba8ac07f30c65b47.tar.gz
Backport: 378053
Sync Win32 behavior with Unix behavior for unbuffered file i/o on apr_file_flush(). Note this also makes unbuffered file i/o on win32 consistent with the buffered i/o behavior on the same. PR: 33485 Reported by: Curt Arnold <carnold@apache.org>. git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.2.x@378054 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--file_io/win32/readwrite.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/file_io/win32/readwrite.c b/file_io/win32/readwrite.c
index 5e2103db1..a4863574a 100644
--- a/file_io/win32/readwrite.c
+++ b/file_io/win32/readwrite.c
@@ -482,10 +482,12 @@ APR_DECLARE(apr_status_t) apr_file_flush(apr_file_t *thefile)
}
return rc;
- } else {
- FlushFileBuffers(thefile->filehand);
- return APR_SUCCESS;
}
+
+ /* There isn't anything to do if we aren't buffering the output
+ * so just return success.
+ */
+ return APR_SUCCESS;
}
struct apr_file_printf_data {