mirror of
https://gitee.com/openharmony/third_party_cups
synced 2024-11-26 19:40:32 +00:00
47 lines
1.6 KiB
Diff
47 lines
1.6 KiB
Diff
From ee02b74ad03b52a5226f80dd2f551c1b565cdbb2 Mon Sep 17 00:00:00 2001
|
|
From: Michael R Sweet <michael.r.sweet@gmail.com>
|
|
Date: Wed, 12 Jan 2022 08:12:24 -0500
|
|
Subject: [PATCH] Remove legacy code for RIP_MAX_CACHE environment variable
|
|
(Issue #323)
|
|
|
|
Reference:https://github.com/OpenPrinting/cups/commit/ee02b74ad03b52a5226f80dd2f551c1b565cdbb2
|
|
|
|
---
|
|
CHANGES.md | 12 +++++++++---
|
|
scheduler/job.c | 7 ++-----
|
|
2 files changed, 11 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/scheduler/job.c b/scheduler/job.c
|
|
index fd69f71c9c..fbacc4cd12 100644
|
|
--- a/scheduler/job.c
|
|
+++ b/scheduler/job.c
|
|
@@ -541,10 +541,8 @@ cupsdContinueJob(cupsd_job_t *job) /* I - Job */
|
|
/* PRINTER_LOCATION env variable */
|
|
printer_name[255],
|
|
/* PRINTER env variable */
|
|
- *printer_state_reasons = NULL,
|
|
+ *printer_state_reasons = NULL;
|
|
/* PRINTER_STATE_REASONS env var */
|
|
- rip_max_cache[255];
|
|
- /* RIP_MAX_CACHE env variable */
|
|
|
|
|
|
cupsdLogMessage(CUPSD_LOG_DEBUG2,
|
|
@@ -749,7 +747,7 @@ cupsdContinueJob(cupsd_job_t *job) /* I - Job */
|
|
|
|
raw_file = !strcmp(job->filetypes[job->current_file]->super, "application") &&
|
|
!strcmp(job->filetypes[job->current_file]->type, "vnd.cups-raw");
|
|
-
|
|
+
|
|
if ((job->compressions[job->current_file] && (!job->printer->remote || job->num_files == 1)) ||
|
|
(!job->printer->remote && (job->printer->raw || raw_file) && job->num_files > 1))
|
|
{
|
|
@@ -1051,7 +1049,6 @@ cupsdContinueJob(cupsd_job_t *job) /* I - Job */
|
|
envp[envc ++] = apple_language;
|
|
#endif /* __APPLE__ */
|
|
envp[envc ++] = ppd;
|
|
- envp[envc ++] = rip_max_cache;
|
|
envp[envc ++] = content_type;
|
|
envp[envc ++] = device_uri;
|
|
envp[envc ++] = printer_info;
|