Remove unnecessary pointer change.

Mirror conflicts fixes to cupstestppd.

Debugging update in cupsd.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@7780 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/cups/conflicts.c b/cups/conflicts.c
index cfcdc69030fb817d28932bb0cb4eb0481a29a22d..9eea6a62db3b77368737517c9d5e9d39ad679fa9 100644 (file)
--- a/cups/conflicts.c
+++ b/cups/conflicts.c
@@ -544,10 +544,7 @@ ppd_load_constraints(ppd_file_t *ppd)      /* I - PPD file */
          vptr ++;
 
         if (*vptr == '*')
-       {
-         vptr --;
          choice[0] = '\0';
-       }
        else
        {
          for (ptr = choice; *vptr && !isspace(*vptr & 255); vptr ++)

diff --git a/scheduler/job.c b/scheduler/job.c
index d564018e9726227166eaea55bbca44fcba111e09..27e598b7b0a736db32f9f443b8e604891bbc4ce2 100644 (file)
--- a/scheduler/job.c
+++ b/scheduler/job.c
@@ -373,8 +373,9 @@ cupsdCheckJobs(void)
     */
 
     cupsdLogMessage(CUPSD_LOG_DEBUG2,
-                    "cupsdCheckJobs: Job %d: state_value=%d, loaded=%s",
-                    job->id, job->state_value, job->attrs ? "yes" : "no");
+                    "cupsdCheckJobs: Job %d: dest=%s, dtype=%x, "
+                   "state_value=%d, loaded=%s", job->id, job->dest, job->dtype,
+                   job->state_value, job->attrs ? "yes" : "no");
 
     if (job->state_value == IPP_JOB_HELD &&
         job->hold_until &&

diff --git a/systemv/cupstestppd.c b/systemv/cupstestppd.c
index f70028bfbfdf22a04c74d5a9ddce3889df2d72a0..b80e4d52acc8c972a8d99c0f44bfc66e62a542a2 100644 (file)
--- a/systemv/cupstestppd.c
+++ b/systemv/cupstestppd.c
@@ -1767,7 +1767,7 @@ check_constraints(ppd_file_t *ppd,        /* I - PPD file */
 
       for (vptr = strchr(constattr->value, '*');
            vptr;
-          vptr = strchr(vptr + 1, '*'))
+          vptr = strchr(vptr, '*'))
       {
        /*
         * Extract "*Option Choice" or just "*Option"...
@@ -1783,10 +1783,7 @@ check_constraints(ppd_file_t *ppd,       /* I - PPD file */
          vptr ++;
 
         if (*vptr == '*')
-       {
-         vptr --;
          choice[0] = '\0';
-       }
        else
        {
          for (ptr = choice; *vptr && !isspace(*vptr & 255); vptr ++)