[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  c360822... s3: Directly call write_data from print_job_write()
       via  3aba8e9... s3: Remove unused "pos" arg from print_job_write
      from  feb22e0... s3-samr: Correctly fix the transition from enum to uint32_t.

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


- Log -----------------------------------------------------------------
commit c36082222643059b3f81d2dcd962c550fb497b74
Author: Volker Lendecke <vl at samba.org>
Date:   Sun Aug 15 14:46:46 2010 +0200

    s3: Directly call write_data from print_job_write()

commit 3aba8e9b7e1feb3a429dfa8e68fb00b61e985ffd
Author: Volker Lendecke <vl at samba.org>
Date:   Sun Aug 15 14:45:48 2010 +0200

    s3: Remove unused "pos" arg from print_job_write

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

Summary of changes:
 source3/include/printing.h          |    3 +--
 source3/printing/printing.c         |    5 ++---
 source3/rpc_server/srv_spoolss_nt.c |    1 -
 3 files changed, 3 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/include/printing.h b/source3/include/printing.h
index 1aa4e38..b5fd98d 100644
--- a/source3/include/printing.h
+++ b/source3/include/printing.h
@@ -137,8 +137,7 @@ bool print_job_resume(struct auth_serversupplied_info *server_info,
 		      int snum, uint32 jobid, WERROR *errcode);
 ssize_t print_job_write(struct tevent_context *ev,
 			struct messaging_context *msg_ctx,
-			int snum, uint32 jobid, const char *buf, SMB_OFF_T pos,
-			size_t size);
+			int snum, uint32 jobid, const char *buf, size_t size);
 int print_queue_length(struct messaging_context *msg_ctx, int snum,
 		       print_status_struct *pstatus);
 WERROR print_job_start(struct auth_serversupplied_info *server_info,
diff --git a/source3/printing/printing.c b/source3/printing/printing.c
index 31b802d..82516b3 100644
--- a/source3/printing/printing.c
+++ b/source3/printing/printing.c
@@ -2352,8 +2352,7 @@ pause, or resume print job. User name: %s. Printer name: %s.",
 
 ssize_t print_job_write(struct tevent_context *ev,
 			struct messaging_context *msg_ctx,
-			int snum, uint32 jobid, const char *buf, SMB_OFF_T pos,
-			size_t size)
+			int snum, uint32 jobid, const char *buf, size_t size)
 {
 	const char* sharename = lp_const_servicename(snum);
 	ssize_t return_code;
@@ -2372,7 +2371,7 @@ ssize_t print_job_write(struct tevent_context *ev,
 		return -1;
 	}
 
-	return_code = write_data_at_offset(pjob->fd, buf, size, pos);
+	return_code = write_data(pjob->fd, buf, size);
 
 	if (return_code>0) {
 		pjob->size += size;
diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
index 1c04ef1..893ddce 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -5366,7 +5366,6 @@ WERROR _spoolss_WritePrinter(struct pipes_struct *p,
 	buffer_written = print_job_write(server_event_context(),p->msg_ctx,
 						   snum, Printer->jobid,
 						   (const char *)r->in.data.data,
-						   (SMB_OFF_T)-1,
 						   (size_t)r->in._data_size);
 	if (buffer_written == (ssize_t)-1) {
 		*r->out.num_written = 0;


-- 
Samba Shared Repository