Changeset 751 for trunk/server/source3/printing/lpq_parse.c

Timestamp:

Nov 29, 2012, 1:59:04 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.9

File:

• trunk/server/source3/printing/lpq_parse.c (modified) (12 diffs)

trunk/server/source3/printing/lpq_parse.c

@@ -165 +165 @@
         }
 
-        buf->job = atoi(tok[JOBTOK]);
+        buf->sysjob = atoi(tok[JOBTOK]);
         buf->size = atoi(tok[TOTALTOK]);
         buf->status = strequal(tok[RANKTOK],"active")?LPQ_PRINTING:LPQ_QUEUED;
@@ -282 +282 @@
         }
 
-        buf->job  = atoi(tokarr[LPRNG_JOBTOK]);
+        buf->sysjob = atoi(tokarr[LPRNG_JOBTOK]);
         buf->size = atoi(tokarr[LPRNG_TOTALTOK]);
 
@@ -385 +385 @@
                         }
 
-                        buf->job = atoi(tok[1]);
+                        buf->sysjob = atoi(tok[1]);
                         buf->status = strequal(tok[0],"HELD")?LPQ_PAUSED:LPQ_QUEUED;
                         buf->priority = 0;
@@ -421 +421 @@
                 }
 
-                buf->job = atoi(tok[3]);
+                buf->sysjob = atoi(tok[3]);
                 buf->status = strequal(tok[2],"RUNNING")?LPQ_PRINTING:LPQ_QUEUED;
                 buf->priority = 0;
@@ -512 +512 @@
                 /* fill things from header line */
                 buf->time = jobtime;
-                buf->job = jobid;
+                buf->sysjob = jobid;
                 buf->status = jobstat;
                 buf->priority = jobprio;
@@ -652 +652 @@
         }
 
-        buf->job = atoi(tok[1]);
+        buf->sysjob = atoi(tok[1]);
         buf->size = atoi(tok[3]);
         if (count > 7 && strequal(tok[7],"on")) {
@@ -727 +727 @@
         }
 
-        buf->job = atoi(tok[2]);
+        buf->sysjob = atoi(tok[2]);
         buf->size = atoi(tok[4]);
         buf->status = strequal(tok[3],"active")?LPQ_PRINTING:LPQ_QUEUED;
@@ -807 +807 @@
         }
 
-        buf->job = atoi(tok[4]);
+        buf->sysjob = atoi(tok[4]);
 
         buf->size = atoi(tok[7]);
@@ -897 +897 @@
         trim_char(parse_line->jobname, '\0', ' ');
 
-        buf->job = atoi(parse_line->jobid);
+        buf->sysjob = atoi(parse_line->jobid);
         buf->priority = 0;
         buf->size = atoi(parse_line->size);
@@ -958 +958 @@
 
         /* Get the jobid */
-        buf->job = atoi(parse_line->jobid);
+        buf->sysjob = atoi(parse_line->jobid);
 
         /* Get the job name */
@@ -1024 +1024 @@
                 switch (toknum) {
                 case 0:
-                        buf->job = atoi(tok);
+                        buf->sysjob = atoi(tok);
                         break;
                 case 1:
@@ -1153 +1153 @@
 }
 
-/****************************************************************************
- Parse a file name from the system spooler to generate a jobid.
-****************************************************************************/
-
-uint32_t print_parse_jobid(const char *fname)
-{
-        int jobid;
-        const char *p = strstr_m(fname,PRINT_SPOOL_PREFIX);
-
-        if (!p) {
-                return (uint32_t)-1;
-        }
-        p += strlen(PRINT_SPOOL_PREFIX);
-        jobid = atoi(p);
-        if (jobid <= 0) {
-                return (uint32_t)-1;
-        }
-        return (uint32_t)jobid;
-}