]> git.ipfire.org Git - thirdparty/cups.git/commitdiff
Merge remote job state change into a single write to stderr.
authormike <mike@7a7537e8-13f0-0310-91df-b6672ffda945>
Wed, 4 May 2011 20:44:03 +0000 (20:44 +0000)
committermike <mike@7a7537e8-13f0-0310-91df-b6672ffda945>
Wed, 4 May 2011 20:44:03 +0000 (20:44 +0000)
git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@9743 7a7537e8-13f0-0310-91df-b6672ffda945

backend/ipp.c

index e9bc7d8568292f1d483560f62172e48bb074d70a..507a2b346c5b79341cddaebafed56d5455703686 100644 (file)
@@ -1582,17 +1582,22 @@ main(int  argc,                         /* I - Number of command-line args */
 
          if (cups_version && last_job_state != job_state->values[0].integer)
          {
-           if (last_job_state >= IPP_JOB_PENDING &&
-               last_job_state <= IPP_JOB_COMPLETED)
-             fprintf(stderr, "STATE: -%s\n",
-                     remote_job_states[last_job_state - IPP_JOB_PENDING]);
+           int new_job_state = job_state->values[0].integer;
+                                       /* New job-state value */
 
-            last_job_state = job_state->values[0].integer;
+           if (last_job_state < IPP_JOB_PENDING ||
+               last_job_state > IPP_JOB_COMPLETED)
+             last_job_state = IPP_JOB_PENDING;
 
-           if (last_job_state >= IPP_JOB_PENDING &&
-               last_job_state <= IPP_JOB_COMPLETED)
-             fprintf(stderr, "STATE: +%s\n",
-                     remote_job_states[last_job_state - IPP_JOB_PENDING]);
+           if (new_job_state < IPP_JOB_PENDING ||
+               new_job_state > IPP_JOB_COMPLETED)
+             new_job_state = IPP_JOB_PENDING;
+
+           fprintf(stderr, "STATE: -%s\nSTATE: +%s\n",
+                   remote_job_states[last_job_state - IPP_JOB_PENDING],
+                   remote_job_states[new_job_state - IPP_JOB_PENDING]);
+
+            last_job_state = new_job_state;
          }
 
          if ((job_sheets = ippFindAttribute(response,