Skip to content

Commit

Permalink
Fix some new compiler warnings (Issue #5700)
Browse files Browse the repository at this point in the history
  • Loading branch information
michaelrsweet committed Dec 13, 2019
1 parent b018978 commit dbdf8a2
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
3 changes: 2 additions & 1 deletion CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,9 @@ Changes in CUPS v2.3.1
Issue #5683, Issue #5684)
- Fixed an error in the jobs web interface template (Issue #5694)
- Fixed an off-by-one error in `ippEnumString` (Issue #5695)
- The IPP backend did not detect all cases where a job should be retried using
- Fixed some new compiler warnings (Issue #5700)
- Fixed a few issues with the Apple Raster support (rdar:https://55301114)
- The IPP backend did not detect all cases where a job should be retried using
a raster format (rdar:https://56021091)
- Fixed spelling of "fold-accordion".
- Fixed the default common name for TLS certificates used by `ippeveprinter`.
Expand Down
3 changes: 1 addition & 2 deletions backend/ipp.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down Expand Up @@ -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...
Expand Down
6 changes: 3 additions & 3 deletions backend/lpd.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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))
{
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit dbdf8a2

Please sign in to comment.