You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
110 lines
3.1 KiB
110 lines
3.1 KiB
8 months ago
|
From 7271db11d27fe436f0c743bed3be8a5c6f93f2c2 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Michael R Sweet <michael.r.sweet@gmail.com>
|
||
|
|
Date: Mon, 9 Apr 2018 09:50:19 -0400
|
||
|
|
Subject: [PATCH] Use cupsGetNamedDest for legacy printing APIs (Issue #5288)
|
||
|
|
|
||
|
|
---
|
||
|
|
cups/util.c | 59 +++++-----------------------
|
||
|
|
xcode/CUPS.xcodeproj/project.pbxproj | 6 ++-
|
||
|
|
2 files changed, 15 insertions(+), 50 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/cups/util.c b/cups/util.c
|
||
|
|
index ebc54d3cf..b15963e9e 100644
|
||
|
|
--- a/cups/util.c
|
||
|
|
+++ b/cups/util.c
|
||
|
|
@@ -21,19 +22,6 @@
|
||
|
|
#endif /* WIN32 || __EMX__ */
|
||
|
|
|
||
|
|
|
||
|
|
-/*
|
||
|
|
- * Enumeration data and callback...
|
||
|
|
- */
|
||
|
|
-
|
||
|
|
-typedef struct _cups_createdata_s
|
||
|
|
-{
|
||
|
|
- const char *name; /* Destination name */
|
||
|
|
- cups_dest_t *dest; /* Matching destination */
|
||
|
|
-} _cups_createdata_t;
|
||
|
|
-
|
||
|
|
-static int cups_create_cb(_cups_createdata_t *data, unsigned flags, cups_dest_t *dest);
|
||
|
|
-
|
||
|
|
-
|
||
|
|
/*
|
||
|
|
* 'cupsCancelJob()' - Cancel a print job on the default server.
|
||
|
|
*
|
||
|
|
@@ -168,7 +156,7 @@ cupsCreateJob(
|
||
|
|
{
|
||
|
|
int job_id = 0; /* job-id value */
|
||
|
|
ipp_status_t status; /* Create-Job status */
|
||
|
|
- _cups_createdata_t data; /* Enumeration data */
|
||
|
|
+ cups_dest_t *dest; /* Destination */
|
||
|
|
cups_dinfo_t *info; /* Destination information */
|
||
|
|
|
||
|
|
|
||
|
|
@@ -188,12 +176,7 @@ cupsCreateJob(
|
||
|
|
* Lookup the destination...
|
||
|
|
*/
|
||
|
|
|
||
|
|
- data.name = name;
|
||
|
|
- data.dest = NULL;
|
||
|
|
-
|
||
|
|
- cupsEnumDests(0, 1000, NULL, 0, 0, (cups_dest_cb_t)cups_create_cb, &data);
|
||
|
|
-
|
||
|
|
- if (!data.dest)
|
||
|
|
+ if ((dest = cupsGetNamedDest(http, name, NULL)) == NULL)
|
||
|
|
{
|
||
|
|
DEBUG_puts("1cupsCreateJob: Destination not found.");
|
||
|
|
_cupsSetError(IPP_STATUS_ERROR_INTERNAL, strerror(ENOENT), 0);
|
||
|
|
@@ -205,18 +188,18 @@ cupsCreateJob(
|
||
|
|
*/
|
||
|
|
|
||
|
|
DEBUG_puts("1cupsCreateJob: Querying destination info.");
|
||
|
|
- if ((info = cupsCopyDestInfo(http, data.dest)) == NULL)
|
||
|
|
+ if ((info = cupsCopyDestInfo(http, dest)) == NULL)
|
||
|
|
{
|
||
|
|
DEBUG_puts("1cupsCreateJob: Query failed.");
|
||
|
|
- cupsFreeDests(1, data.dest);
|
||
|
|
+ cupsFreeDests(1, dest);
|
||
|
|
return (0);
|
||
|
|
}
|
||
|
|
|
||
|
|
- status = cupsCreateDestJob(http, data.dest, info, &job_id, title, num_options, options);
|
||
|
|
+ status = cupsCreateDestJob(http, dest, info, &job_id, title, num_options, options);
|
||
|
|
DEBUG_printf(("1cupsCreateJob: cupsCreateDestJob returned %04x (%s)", status, ippErrorString(status)));
|
||
|
|
|
||
|
|
cupsFreeDestInfo(info);
|
||
|
|
- cupsFreeDests(1, data.dest);
|
||
|
|
+ cupsFreeDests(1, dest);
|
||
|
|
|
||
|
|
/*
|
||
|
|
* Return the job...
|
||
|
|
@@ -968,25 +951,3 @@ cupsStartDocument(
|
||
|
|
return (status);
|
||
|
|
}
|
||
|
|
|
||
|
|
-
|
||
|
|
-/*
|
||
|
|
- * 'cups_create_cb()' - Find the destination for printing.
|
||
|
|
- */
|
||
|
|
-
|
||
|
|
-static int /* O - 0 on match */
|
||
|
|
-cups_create_cb(
|
||
|
|
- _cups_createdata_t *data, /* I - Data from cupsCreateJob call */
|
||
|
|
- unsigned flags, /* I - Enumeration flags */
|
||
|
|
- cups_dest_t *dest) /* I - Destination */
|
||
|
|
-{
|
||
|
|
- DEBUG_printf(("2cups_create_cb(data=%p(%s), flags=%08x, dest=%p(%s))", (void *)data, data->name, flags, (void *)dest, dest->name));
|
||
|
|
-
|
||
|
|
- (void)flags;
|
||
|
|
-
|
||
|
|
- if (dest->instance || strcasecmp(data->name, dest->name))
|
||
|
|
- return (1);
|
||
|
|
-
|
||
|
|
- cupsCopyDest(dest, 0, &data->dest);
|
||
|
|
-
|
||
|
|
- return (0);
|
||
|
|
-}
|
||
|
|
--
|
||
|
|
2.35.1
|
||
|
|
|