From: David Disseldorp <ddiss@samba.org>
Date: Mon, 30 Jan 2012 12:44:33 +0000 (+0100)
Subject: s3-printing: remove print_parse_jobid() from print_cups.c
X-Git-Url: http://git.samba.org/?p=ddiss%2Fsamba.git;a=commitdiff_plain;h=2096ea1b72bc131db51ecb6f22659895e9359075

s3-printing: remove print_parse_jobid() from print_cups.c

The spoolss print job identifier is now passed to the cups layer via
struct printjob, therefore it is no longer necessary to parse the job
filename to determine it.
---

diff --git a/source3/printing/print_cups.c b/source3/printing/print_cups.c
index 79b146c076a..fd052df17f1 100644
--- a/source3/printing/print_cups.c
+++ b/source3/printing/print_cups.c
@@ -871,7 +871,6 @@ static int cups_job_submit(int snum, struct printjob *pjob)
 	char *cupsoptions = NULL;
 	char *filename = NULL;
 	size_t size;
-	uint32_t jobid = (uint32_t)-1;
 
 	DEBUG(5,("cups_job_submit(%d, %p)\n", snum, pjob));
 
@@ -933,21 +932,12 @@ static int cups_job_submit(int snum, struct printjob *pjob)
 	             "job-originating-host-name", NULL,
 		     pjob->clientmachine);
 
-	/* Get the jobid from the filename. */
-	jobid = print_parse_jobid(pjob->filename);
-	if (jobid == (uint32_t)-1) {
-		DEBUG(0,("cups_job_submit: failed to parse jobid from name %s\n",
-				pjob->filename ));
-		jobid = 0;
-	}
-
 	if (!push_utf8_talloc(frame, &jobname, pjob->jobname, &size)) {
 		goto out;
 	}
 	new_jobname = talloc_asprintf(frame,
 			"%s%.8u %s", PRINT_SPOOL_PREFIX,
-			(unsigned int)jobid,
-			jobname);
+			pjob->jobid, jobname);
 	if (new_jobname == NULL) {
 		goto out;
 	}