[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-766-g66b97d3

[Volker Lendecke]

The branch, master has been updated
       via  66b97d36b9a086f2ef76f2d42a07bfdbdaa0f00d (commit)
      from  742496d2522ed4a53ce087adc4813331dbc75320 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 66b97d36b9a086f2ef76f2d42a07bfdbdaa0f00d
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 16eb4a7..3f9d5c5 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