From ee02b74ad03b52a5226f80dd2f551c1b565cdbb2 Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Wed, 12 Jan 2022 08:12:24 -0500 Subject: [PATCH] Remove legacy code for RIP_MAX_CACHE environment variable (Issue #323) --- CHANGES.md | 12 +++++++++--- scheduler/job.c | 7 ++----- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 658c5602ce..ccee6c8f54 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -5,12 +5,15 @@ Changes in CUPS v2.4.1 (TBA) ---------------------------- - Configuration script now checks linking for -Wl,-pie flags (Issue #303) -- Fixed memory leaks - in testi18n (Issue #313), in `cups_enum_dests()` (Issue #317), - in `_cupsEncodeOption()` and `http_tls_upgrade()` (Issue #322) +- Fixed memory leaks - in testi18n (Issue #313), in `cups_enum_dests()` + (Issue #317), in `_cupsEncodeOption()` and `http_tls_upgrade()` (Issue #322) - Fixed missing bracket in de/index.html (Issue #299) - Fixed typos in configuration scripts (Issues #304, #316) +- Removed remaining legacy code for `RIP_MAX_CACHE` environment variable + (Issue #323) - Removed deprecated directives from cupsctl and cups-files.conf (Issue #300) + Changes in CUPS v2.4.0 (29th November 2021) ------------------------------------------- @@ -21,6 +24,7 @@ Changes in CUPS v2.4.0 (29th November 2021) - Fixed compilation on Solaris (Issue #293) - Fixed and improved German translations (Issue #296, Issue #297) + Changes in CUPS v2.4rc1 (12th November 2021) -------------------------------------------- @@ -28,6 +32,7 @@ Changes in CUPS v2.4rc1 (12th November 2021) if the queue is raw or with driver (Issue #286) - Compilation now uses -fstack-protector-strong if available (Issue #285) + Changes in CUPS v2.4b1 (27th October 2021) ------------------------------------------ @@ -40,7 +45,8 @@ Changes in CUPS v2.4b1 (27th October 2021) - Added a JSON output mode for `ipptool`. - The `ipptool` command now correctly reports an error when a test file cannot be found. -- CUPS library now uses thread safe `getpwnam_r` and `getpwuid_r` functions (Issue #274) +- CUPS library now uses thread safe `getpwnam_r` and `getpwuid_r` functions + (Issue #274) - Fixed Kerberos authentication for the web interface (Issue #19) - The ZPL sample driver now supports more "standard" label sizes (Issue #70) - Fixed reporting of printer instances when enumerating and when no options are 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; -- 2.47.2