From 86ecc4dfc1eb0ab9a1c5243d5596d1f585534256 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Wed, 18 Sep 2024 13:23:47 +0200 Subject: [PATCH] Apply feedback --- scheduler/ipp.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/scheduler/ipp.c b/scheduler/ipp.c index 7a37a15b6..caa073945 100644 --- a/scheduler/ipp.c +++ b/scheduler/ipp.c @@ -5319,7 +5319,7 @@ create_local_bg_thread( * try to get it separately */ - if (ippFindAttribute(response, "media-col-database", IPP_TAG_ZERO) == + if (ippFindAttribute(response, "media-col-database", IPP_TAG_BEGIN_COLLECTION) == NULL) { ipp_t *response2; @@ -5356,21 +5356,18 @@ create_local_bg_thread( } } - if (ippFindAttribute(response, "media-col-database", IPP_TAG_ZERO) == NULL + if (ippFindAttribute(response, "media-col-database", IPP_TAG_BEGIN_COLLECTION) == NULL && ippFindAttribute(response, "media-supported", IPP_TAG_ZERO) == NULL && ippFindAttribute(response, "media-size-supported", IPP_TAG_BEGIN_COLLECTION) == NULL) { - cupsdLogMessage(CUPSD_LOG_ERROR, "The printer %s doesn't provide attributes \"media-col-database\"," - " \"media-size-supported\" or \"media-supported\" required for generating" - " printer capabilities.", printer->name); + cupsdLogMessage(CUPSD_LOG_ERROR, "The printer %s doesn't provide attributes \"media-col-database\", \"media-size-supported\" or \"media-supported\" required for generating printer capabilities.", printer->name); /* Force printer to timeout and be deleted */ cupsRWLockWrite(&printer->lock); printer->state_time = 0; cupsRWUnlock(&printer->lock); - send_ipp_status(con, IPP_STATUS_ERROR_DEVICE, _("The printer %s does not provide attributes" - " required for IPP Everywhere."), printer->name); + send_ipp_status(con, IPP_STATUS_ERROR_DEVICE, _("The printer %s does not provide attributes required for IPP Everywhere."), printer->name); goto finish_response; }