[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-711-g5525dc5

[Jeremy Allison]

The branch, v3-2-test has been updated
       via  5525dc5f09a79d30f6c52fc3a88c8bce3060e642 (commit)
      from  9f148daaf2e240002914183655c2b2cc9067759f (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit 5525dc5f09a79d30f6c52fc3a88c8bce3060e642
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Apr 8 15:08:47 2008 -0700

    Check x_fflush returns.
    Jeremy.

-----------------------------------------------------------------------

Summary of changes:
 source/lib/xfile.c |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/lib/xfile.c b/source/lib/xfile.c
index ee6e581..d20a95b 100644
--- a/source/lib/xfile.c
+++ b/source/lib/xfile.c
@@ -47,7 +47,7 @@ XFILE *x_stderr = &_x_stderr;
 /* simulate setvbuf() */
 int x_setvbuf(XFILE *f, char *buf, int mode, size_t size)
 {
-	x_fflush(f);
+	if (x_fflush(f) != 0) return -1;
 	if (f->bufused) return -1;
 
 	/* on files being read full buffering is the only option */
@@ -150,7 +150,7 @@ int x_fclose(XFILE *f)
 	int ret;
 
 	/* make sure we flush any buffered data */
-	x_fflush(f);
+	(void)x_fflush(f);
 
 	ret = close(f->fd);
 	f->fd = -1;
@@ -189,7 +189,9 @@ size_t x_fwrite(const void *p, size_t size, size_t nmemb, XFILE *f)
 
 		if (n == 0) {
 			/* it's full, flush it */
-			x_fflush(f);
+			if (x_fflush(f) != 0) {
+				return -1;
+			}
 			continue;
 		}
 
@@ -204,7 +206,9 @@ size_t x_fwrite(const void *p, size_t size, size_t nmemb, XFILE *f)
 		int i;
 		for (i=(size*nmemb)-1; i>=0; i--) {
 			if (*(i+(const char *)p) == '\n') {
-				x_fflush(f);
+				if (x_fflush(f) != 0) {
+					return -1;
+				}
 				break;
 			}
 		}


-- 
Samba Shared Repository