[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  475531c... Standardize debug messages for read and write.
      from  aa51fa0... s3:fix the waf build after registry changes.

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


- Log -----------------------------------------------------------------
commit 475531c9bb6c2d4b522a77d0ced09a9775704085
Author: Jeremy Allison <jra at samba.org>
Date:   Tue May 25 11:39:46 2010 -0700

    Standardize debug messages for read and write.
    
    Jeremy.

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

Summary of changes:
 source3/smbd/smb2_read.c  |    6 ++++++
 source3/smbd/smb2_write.c |    8 +++++---
 2 files changed, 11 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/smb2_read.c b/source3/smbd/smb2_read.c
index d4c38d6..b29da4a 100644
--- a/source3/smbd/smb2_read.c
+++ b/source3/smbd/smb2_read.c
@@ -310,6 +310,12 @@ static struct tevent_req *smbd_smb2_read_send(TALLOC_CTX *mem_ctx,
 		return tevent_req_post(req, ev);
 	}
 
+	DEBUG(3,("smbd_smb2_read: fnum=[%d/%s] length=%lu offset=%lu read=%lu\n",
+		fsp->fnum, fsp_str_dbg(fsp),
+		(unsigned long)in_length,
+		(unsigned long)in_offset,
+		(unsigned long)nread));
+
 	state->out_data.length = nread;
 	state->out_remaining = 0;
 	tevent_req_done(req);
diff --git a/source3/smbd/smb2_write.c b/source3/smbd/smb2_write.c
index ae98c81..c3ac816 100644
--- a/source3/smbd/smb2_write.c
+++ b/source3/smbd/smb2_write.c
@@ -287,9 +287,11 @@ static struct tevent_req *smbd_smb2_write_send(TALLOC_CTX *mem_ctx,
 		return tevent_req_post(req, ev);
 	}
 
-	DEBUG(3,("smbd_smb2_write: fnum=[%d/%s] length=%d offset=%d wrote=%d\n",
-		fsp->fnum, fsp_str_dbg(fsp), (int)in_data.length,
-		(int)in_offset, (int)nwritten));
+	DEBUG(3,("smbd_smb2_write: fnum=[%d/%s] length=%lu offset=%lu wrote=%lu\n",
+		fsp->fnum, fsp_str_dbg(fsp),
+		(unsigned long)in_data.length,
+		(unsigned long)in_offset,
+		(unsigned long)nwritten));
 
 	if (in_flags & 0x00000001) {
 		write_through = true;


-- 
Samba Shared Repository