From 87f3f39005dffdef580c919470737426fca257a5 Mon Sep 17 00:00:00 2001 From: Solomon Peachy Date: Wed, 29 Sep 2021 22:54:07 -0400 Subject: [PATCH] various: We used CUPS_BACKEND_HOLD instead of _STOP for some errors --- backend_canonselphy.c | 4 ++-- backend_dnpds40.c | 4 ++-- backend_mitsu9550.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/backend_canonselphy.c b/backend_canonselphy.c index c6cb992..b7f7483 100644 --- a/backend_canonselphy.c +++ b/backend_canonselphy.c @@ -860,7 +860,7 @@ top: /* Try to clear error state */ if ((ret = send_data(ctx->conn, ctx->printer->clear_error, ctx->printer->clear_error_len))) return CUPS_BACKEND_FAILED; - return CUPS_BACKEND_HOLD; + return CUPS_BACKEND_STOP; } if (memcmp(rdbuf, rdbuf2, READBACK_LEN)) { @@ -1097,7 +1097,7 @@ static const char *canonselphy_prefixes[] = { const struct dyesub_backend canonselphy_backend = { .name = "Canon SELPHY CP/ES (legacy)", - .version = "0.110", + .version = "0.111", .uri_prefixes = canonselphy_prefixes, .cmdline_usage = canonselphy_cmdline, .cmdline_arg = canonselphy_cmdline_arg, diff --git a/backend_dnpds40.c b/backend_dnpds40.c index 033b800..71009c5 100644 --- a/backend_dnpds40.c +++ b/backend_dnpds40.c @@ -2234,7 +2234,7 @@ top: return CUPS_BACKEND_CANCEL; default: ERROR("Fatal Printer Error: %d => %s, halting queue!\n", status, dnpds40_statuses(status)); - return CUPS_BACKEND_HOLD; + return CUPS_BACKEND_STOP; } { @@ -3484,7 +3484,7 @@ static const char *dnpds40_prefixes[] = { const struct dyesub_backend dnpds40_backend = { .name = "DNP DS-series / Citizen C-series", - .version = "0.142", + .version = "0.143", .uri_prefixes = dnpds40_prefixes, .cmdline_usage = dnpds40_cmdline, .cmdline_arg = dnpds40_cmdline_arg, diff --git a/backend_mitsu9550.c b/backend_mitsu9550.c index f0ccec2..8e1564a 100644 --- a/backend_mitsu9550.c +++ b/backend_mitsu9550.c @@ -249,7 +249,7 @@ static const char *cp30_media_types(uint16_t remain) /* Sanity-check media response */ \ if ((media->remain == 0 && media->remain2 == 0) || media->max == 0) { \ ERROR("Printer out of media!\n"); \ - return CUPS_BACKEND_HOLD; \ + return CUPS_BACKEND_STOP; \ } \ #define QUERY_STATUS_II \ @@ -1612,7 +1612,7 @@ static const char *mitsu9550_prefixes[] = { /* Exported */ const struct dyesub_backend mitsu9550_backend = { .name = "Mitsubishi CP9xxx family", - .version = "0.61" " (lib " LIBMITSU_VER ")", + .version = "0.62" " (lib " LIBMITSU_VER ")", .uri_prefixes = mitsu9550_prefixes, .cmdline_usage = mitsu9550_cmdline, .cmdline_arg = mitsu9550_cmdline_arg,