Attachment 2063 Details for Bug 3962 – Patch

[patch] Patch

look1 (text/plain), 2.92 KB, created by Jeremy Allison on 2006-07-25 16:31:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2006-07-25 16:31:28 UTC

Size: 2.92 KB

patch

obsolete

>Index: rpc_server/srv_spoolss_nt.c
>===================================================================
>--- rpc_server/srv_spoolss_nt.c	(revision 17244)
>+++ rpc_server/srv_spoolss_nt.c	(working copy)
>@@ -6395,9 +6395,9 @@
> /****************************************************************************
> ****************************************************************************/
> 
>-static void fill_job_info_1(JOB_INFO_1 *job_info, print_queue_struct *queue,
>+static void fill_job_info_1(JOB_INFO_1 *job_info, const print_queue_struct *queue,
>                             int position, int snum, 
>-                            NT_PRINTER_INFO_LEVEL *ntprinter)
>+                            const NT_PRINTER_INFO_LEVEL *ntprinter)
> {
> 	struct tm *t;
> 	
>@@ -6422,9 +6422,9 @@
> /****************************************************************************
> ****************************************************************************/
> 
>-static BOOL fill_job_info_2(JOB_INFO_2 *job_info, print_queue_struct *queue,
>+static BOOL fill_job_info_2(JOB_INFO_2 *job_info, const print_queue_struct *queue,
>                             int position, int snum, 
>-			    NT_PRINTER_INFO_LEVEL *ntprinter,
>+			    const NT_PRINTER_INFO_LEVEL *ntprinter,
> 			    DEVICEMODE *devmode)
> {
> 	struct tm *t;
>@@ -6467,8 +6467,8 @@
>  Enumjobs at level 1.
> ****************************************************************************/
> 
>-static WERROR enumjobs_level1(print_queue_struct *queue, int snum,
>-                              NT_PRINTER_INFO_LEVEL *ntprinter,
>+static WERROR enumjobs_level1(const print_queue_struct *queue, int snum,
>+                              const NT_PRINTER_INFO_LEVEL *ntprinter,
> 			      RPC_BUFFER *buffer, uint32 offered,
> 			      uint32 *needed, uint32 *returned)
> {
>@@ -6478,7 +6478,6 @@
> 	
> 	info=SMB_MALLOC_ARRAY(JOB_INFO_1,*returned);
> 	if (info==NULL) {
>-		SAFE_FREE(queue);
> 		*returned=0;
> 		return WERR_NOMEM;
> 	}
>@@ -6486,8 +6485,6 @@
> 	for (i=0; i<*returned; i++)
> 		fill_job_info_1( &info[i], &queue[i], i, snum, ntprinter );
> 
>-	SAFE_FREE(queue);
>-
> 	/* check the required size. */	
> 	for (i=0; i<*returned; i++)
> 		(*needed) += spoolss_size_job_info_1(&info[i]);
>@@ -6520,8 +6517,8 @@
>  Enumjobs at level 2.
> ****************************************************************************/
> 
>-static WERROR enumjobs_level2(print_queue_struct *queue, int snum,
>-                              NT_PRINTER_INFO_LEVEL *ntprinter,
>+static WERROR enumjobs_level2(const print_queue_struct *queue, int snum,
>+                              const NT_PRINTER_INFO_LEVEL *ntprinter,
> 			      RPC_BUFFER *buffer, uint32 offered,
> 			      uint32 *needed, uint32 *returned)
> {
>@@ -6542,9 +6539,6 @@
> 	for (i=0; i<*returned; i++)
> 		fill_job_info_2(&(info[i]), &queue[i], i, snum, ntprinter, devmode);
> 
>-	free_a_printer(&ntprinter, 2);
>-	SAFE_FREE(queue);
>-
> 	/* check the required size. */	
> 	for (i=0; i<*returned; i++)
> 		(*needed) += spoolss_size_job_info_2(&info[i]);

Actions: View

Attachments on bug 3962: 2062 | 2063 | 2065