[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-595-g1aa65f4

Jeremy Allison jra at samba.org
Sat Mar 28 01:00:55 GMT 2009


The branch, v3-4-test has been updated
       via  1aa65f485b60a80766581e7d3f31565f340aa528 (commit)
      from  63d9694d7a0198375fba3a713d6e5d3bbed7a458 (commit)

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


- Log -----------------------------------------------------------------
commit 1aa65f485b60a80766581e7d3f31565f340aa528
Author: Björn Jacke <bj at sernet.de>
Date:   Fri Mar 27 10:24:18 2009 +0100

    s3: ifdef sendfile code that's only used in other ifdef'ed sendfile code
    
    This fixes a "defined but not used" compile warning.

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

Summary of changes:
 source3/smbd/reply.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index 1ee4708..5cdc59b 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -2679,6 +2679,7 @@ static ssize_t fake_sendfile(files_struct *fsp, SMB_OFF_T startpos,
 	return (ssize_t)nread;
 }
 
+#if defined(WITH_SENDFILE)
 /****************************************************************************
  Deal with the case of sendfile reading less bytes from the file than
  requested. Fill with zeros (all we can do).
@@ -2735,6 +2736,7 @@ static void sendfile_short_send(files_struct *fsp,
 		SAFE_FREE(buf);
 	}
 }
+#endif /* defined WITH_SENDFILE */
 
 /****************************************************************************
  Return a readbraw error (4 bytes of zero).


-- 
Samba Shared Repository


More information about the samba-cvs mailing list