Change some size_t vars to ints.
authorWayne Davison <wayned@samba.org>
Wed, 12 Nov 2008 02:06:11 +0000 (18:06 -0800)
committerWayne Davison <wayned@samba.org>
Wed, 12 Nov 2008 02:06:11 +0000 (18:06 -0800)
fileio.c

index 822bb1a837fea19f650b773ab5df9b7bd6d65bc7..b5b598232dadb28880394a3fde73164439772400 100644 (file)
--- a/fileio.c
+++ b/fileio.c
@@ -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++) {}
        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.
  */
  * 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;
 
 {
        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");
                        }
                                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;
                        if (r1) {
                                memcpy(wf_writeBuf + wf_writeBufCnt, buf, r1);
                                wf_writeBufCnt += r1;