s3-printing: remove print_parse_jobid() from print_cups.c
authorDavid Disseldorp <ddiss@samba.org>
Mon, 30 Jan 2012 12:44:33 +0000 (13:44 +0100)
committerDavid Disseldorp <ddiss@samba.org>
Mon, 25 Jun 2012 11:07:54 +0000 (13:07 +0200)
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

index ff19de200dec6775054f2fd4b0ebb8033dd5bca0..ed2cb388d582ef7a735a2e0e87a73bf6d1e5636c 100644 (file)
@@ -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;
        }