Attachment 3728 Details for Bug 3925 – Tweak spare_seek and a few other size_t vars

[patch] Tweak spare_seek and a few other size_t vars

sparse.patch (text/plain), 1.05 KB, created by Wayne Davison on 2008-11-11 20:04:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Wayne Davison

Created: 2008-11-11 20:04:26 UTC

Size: 1.05 KB

patch

obsolete

>--- a/fileio.c
>+++ b/fileio.c
>@@ -29,7 +29,7 @@
> extern int sparse_files;
> 
> static char last_byte;
>-static size_t sparse_seek = 0;
>+static OFF_T sparse_seek = 0;
> 
> int sparse_end(int f)
> {
>@@ -49,9 +49,9 @@ int sparse_end(int f)
> }
> 
> 
>-static int write_sparse(int f, char *buf, size_t len)
>+static int write_sparse(int f, char *buf, int len)
> {
>-	size_t l1 = 0, l2 = 0;
>+	int l1 = 0, l2 = 0;
> 	int ret;
> 
> 	for (l1 = 0; l1 < len && buf[l1] == 0; l1++) {}
>@@ -109,7 +109,7 @@ int flush_write_file(int f)
>  * write_file does not allow incomplete writes.  It loops internally
>  * until len bytes are written or errno is set.
>  */
>-int write_file(int f,char *buf,size_t len)
>+int write_file(int f, char *buf, int len)
> {
> 	int ret = 0;
> 
>@@ -126,7 +126,7 @@ int write_file(int f,char *buf,size_t len)
> 				if (!wf_writeBuf)
> 					out_of_memory("write_file");
> 			}
>-			r1 = MIN(len, wf_writeBufSize - wf_writeBufCnt);
>+			r1 = (int)MIN((size_t)len, wf_writeBufSize - wf_writeBufCnt);
> 			if (r1) {
> 				memcpy(wf_writeBuf + wf_writeBufCnt, buf, r1);
> 				wf_writeBufCnt += r1;

Actions: View

Attachments on bug 3925: 3728