Attachment 3243 Details for Bug 5335 – Patch

[patch] Patch

look (text/plain), 1.06 KB, created by Jeremy Allison on 2008-04-04 19:35:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2008-04-04 19:35:17 UTC

Size: 1.06 KB

patch

obsolete

>diff --git a/source/lib/xfile.c b/source/lib/xfile.c
>index 8824ca2..d5b1731 100644
>--- a/source/lib/xfile.c
>+++ b/source/lib/xfile.c
>@@ -48,7 +48,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 */
>@@ -151,7 +151,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;
>@@ -190,7 +190,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;
> 		}
> 
>@@ -205,7 +207,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;
> 			}
> 		}

Actions: View

Attachments on bug 5335: 3187 | 3243 | 5612