From 06a5a4d332debf82e76eb73e940b587ff6499f11 Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Mon, 14 May 2018 10:21:51 -0700 Subject: [PATCH] Mark cupsGetDevices as deprecated. Update CUPS Programming Manual. Update CUPS Admin API documentation. Update CUPS PPD documentation. --- cups/adminutil.h | 2 +- cups/getdevices.c | 5 +- doc/help/api-admin.html | 7 ++- doc/help/api-ppd.html | 134 ++++++++++++++++++++++------------------ doc/help/cupspm.epub | Bin 220518 -> 220781 bytes doc/help/cupspm.html | 32 ++++++++++ doc/help/options.html | 19 ------ doc/help/spec-ppd.html | 23 ++----- filter/spec-ppd.shtml | 8 +-- 9 files changed, 125 insertions(+), 105 deletions(-) diff --git a/cups/adminutil.h b/cups/adminutil.h index 77e5941159..c3c0dc3b56 100644 --- a/cups/adminutil.h +++ b/cups/adminutil.h @@ -77,7 +77,7 @@ extern ipp_status_t cupsGetDevices(http_t *http, int timeout, const char *include_schemes, const char *exclude_schemes, cups_device_cb_t callback, - void *user_data) _CUPS_API_1_4; + void *user_data) _CUPS_DEPRECATED; # ifdef __cplusplus diff --git a/cups/getdevices.c b/cups/getdevices.c index e0ac9b5ccd..4981fd896d 100644 --- a/cups/getdevices.c +++ b/cups/getdevices.c @@ -23,7 +23,10 @@ * parameters provide comma-delimited lists of backends to include or omit from * the request respectively. * - * @since CUPS 1.4/macOS 10.6@ + * This function is deprecated with the IPP printer discovery functionality + * being provided by the @link cupsEnumDests@ and @cupsGetDests@ functions. + * + * @deprecated@ */ ipp_status_t /* O - Request status - @code IPP_OK@ on success. */ diff --git a/doc/help/api-admin.html b/doc/help/api-admin.html index 10336b6c5e..e5ae818194 100644 --- a/doc/help/api-admin.html +++ b/doc/help/api-admin.html @@ -657,7 +657,7 @@ int cupsAdminSetServerSettings(http_t *http, int num_settings, cups_option_t *se

Return Value

1 on success, 0 on failure

-

 CUPS 1.4/macOS 10.6 cupsGetDevices

+

 DEPRECATED cupsGetDevices

Get available printer devices.

ipp_status_t cupsGetDevices(http_t *http, int timeout, const char *include_schemes, const char *exclude_schemes, cups_device_cb_t callback, void *user_data);

@@ -683,7 +683,10 @@ ipp_status_t cupsGetDevices(http_t *http, int timeout, const char *include_schem devices to the specified callback function. The "timeout" parameter controls how long the request lasts, while the "include_schemes" and "exclude_schemes" parameters provide comma-delimited lists of backends to include or omit from -the request respectively. +the request respectively.
+
+This function is deprecated with the IPP printer discovery functionality +being provided by the cupsEnumDests and @cupsGetDests@ functions.

Data Types

diff --git a/doc/help/api-ppd.html b/doc/help/api-ppd.html index c287479e55..a0918afd5a 100644 --- a/doc/help/api-ppd.html +++ b/doc/help/api-ppd.html @@ -563,6 +563,7 @@ h3.title {
  • Enumerations