r2155: Reformat, plus steal from Samba4 :-).

[tprouty/samba.git] / source / lib / sendfile.c

diff --git a/source/lib/sendfile.c b/source/lib/sendfile.c
index ccebd25cc1aae1fe8fd50608e5787ba00a3ec1b1..4aa76a0c74ad728ae19104ac2fc52c0894bcb6c8 100644 (file)
--- a/source/lib/sendfile.c
+++ b/source/lib/sendfile.c
@@ -38,7 +38,7 @@ ssize_t sys_sendfile(int tofd, int fromfd, const DATA_BLOB *header, SMB_OFF_T of
 {
        size_t total=0;
        ssize_t ret;
-       ssize_t hdr_len = 0;
+       size_t hdr_len = 0;
 
        /*
         * Send the header first.
@@ -161,7 +161,7 @@ ssize_t sys_sendfile(int tofd, int fromfd, const DATA_BLOB *header, SMB_OFF_T of
 
                vec[0].sfv_fd = SFV_FD_SELF;
                vec[0].sfv_flag = 0;
-               vec[0].sfv_off = header->data;
+               vec[0].sfv_off = (off_t)header->data;
                vec[0].sfv_len = hdr_len = header->length;
 
                vec[1].sfv_fd = fromfd;