diff options
Diffstat (limited to 'backend')
| -rw-r--r-- | backend/ipp.c | 3 | ||||
| -rw-r--r-- | backend/lpd.c | 6 |
2 files changed, 4 insertions, 5 deletions
diff --git a/backend/ipp.c b/backend/ipp.c index 60a4ef20f..3f3e1867d 100644 --- a/backend/ipp.c +++ b/backend/ipp.c @@ -233,7 +233,6 @@ main(int argc, /* I - Number of command-line args */ int waitjob, /* Wait for job complete? */ waitjob_tries = 0, /* Number of times we've waited */ waitprinter; /* Wait for printer ready? */ - time_t waittime; /* Wait time for held jobs */ _cups_monitor_t monitor; /* Monitoring data */ ipp_attribute_t *job_id_attr; /* job-id attribute */ int job_id; /* job-id value */ @@ -2009,7 +2008,7 @@ main(int argc, /* I - Number of command-line args */ _cupsLangPrintFilter(stderr, "INFO", _("Waiting for job to complete.")); - for (delay = _cupsNextDelay(0, &prev_delay), waittime = time(NULL) + 30; !job_canceled;) + for (delay = _cupsNextDelay(0, &prev_delay); !job_canceled;) { /* * Check for side-channel requests... diff --git a/backend/lpd.c b/backend/lpd.c index efc7a9acc..c4aab8b98 100644 --- a/backend/lpd.c +++ b/backend/lpd.c @@ -1046,7 +1046,7 @@ lpd_queue(const char *hostname, /* I - Host to connect to */ * Send the control file... */ - if (lpd_command(fd, "\002%d cfA%03.3d%.15s\n", (int)strlen(control), + if (lpd_command(fd, "\002%d cfA%03d%.15s\n", (int)strlen(control), (int)getpid() % 1000, localhost)) { close(fd); @@ -1096,7 +1096,7 @@ lpd_queue(const char *hostname, /* I - Host to connect to */ * Send the print file... */ - if (lpd_command(fd, "\003" CUPS_LLFMT " dfA%03.3d%.15s\n", + if (lpd_command(fd, "\003" CUPS_LLFMT " dfA%03d%.15s\n", CUPS_LLCAST filestats.st_size, (int)getpid() % 1000, localhost)) { @@ -1179,7 +1179,7 @@ lpd_queue(const char *hostname, /* I - Host to connect to */ * Send control file... */ - if (lpd_command(fd, "\002%d cfA%03.3d%.15s\n", (int)strlen(control), + if (lpd_command(fd, "\002%d cfA%03d%.15s\n", (int)strlen(control), (int)getpid() % 1000, localhost)) { close(fd); |