From 9e1f2f37ecd052d9d42d6275aa005d04a2569f99 Mon Sep 17 00:00:00 2001 From: David Disseldorp Date: Mon, 30 Jan 2012 13:44:33 +0100 Subject: [PATCH] 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. --- source3/printing/print_cups.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/source3/printing/print_cups.c b/source3/printing/print_cups.c index ff19de200de..ed2cb388d58 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; } -- 2.34.1