From e1f19878c6c7abacbce81ae0986bc3dbf35ae5b3 Mon Sep 17 00:00:00 2001
From: msweet
Date: Tue, 19 Aug 2014 12:15:11 +0000
Subject: [PATCH] Update "since CUPS 2.0" into to mention OS X 10.10.
git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@12094 a1ca3aef-8c08-0410-bb20-df032aa958be
---
cups/cups.h | 2 +-
cups/dest-localization.c | 2 +-
cups/dest.c | 2 +-
cups/http-addr.c | 6 +++---
cups/http-support.c | 4 ++--
cups/http.c | 22 +++++++++++-----------
cups/http.h | 4 ++--
cups/ipp-support.c | 2 +-
cups/tls-darwin.c | 16 ++++++++--------
cups/tls-gnutls.c | 16 ++++++++--------
cups/tls-sspi.c | 16 ++++++++--------
doc/help/api-cups.html | 4 ++--
doc/help/api-httpipp.html | 38 +++++++++++++++++++-------------------
13 files changed, 67 insertions(+), 67 deletions(-)
diff --git a/cups/cups.h b/cups/cups.h
index f28c28d93..89558fcb2 100644
--- a/cups/cups.h
+++ b/cups/cups.h
@@ -615,7 +615,7 @@ extern int cupsGetDestMediaDefault(http_t *http, cups_dest_t *dest,
extern void cupsSetUserAgent(const char *user_agent) _CUPS_API_1_7;
extern const char *cupsUserAgent(void) _CUPS_API_1_7;
-/* New in CUPS 2.0 */
+/* New in CUPS 2.0/OS X 10.10 */
extern cups_dest_t *cupsGetDestWithURI(const char *name, const char *uri) _CUPS_API_2_0;
extern const char *cupsLocalizeDestMedia(http_t *http, cups_dest_t *dest, cups_dinfo_t *info, unsigned flags, cups_size_t *size) _CUPS_API_2_0;
extern int cupsMakeServerCredentials(const char *path, const char *common_name, int num_alt_names, const char **alt_names, time_t expiration_date) _CUPS_API_2_0;
diff --git a/cups/dest-localization.c b/cups/dest-localization.c
index 4ed2675b4..5174953b5 100644
--- a/cups/dest-localization.c
+++ b/cups/dest-localization.c
@@ -38,7 +38,7 @@ static char *cups_scan_strings(char *buffer);
* The returned string is stored in the destination information and will become
* invalid if the destination information is deleted.
*
- * @since CUPS 2.0@
+ * @since CUPS 2.0/OS X 10.10@
*/
const char * /* O - Localized string */
diff --git a/cups/dest.c b/cups/dest.c
index f3db6b1d6..cbccd6680 100644
--- a/cups/dest.c
+++ b/cups/dest.c
@@ -1310,7 +1310,7 @@ _cupsGetDestResource(
*
* "uri" is the "ipp" or "ipps" URI for the printer.
*
- * @since CUPS 2.0@
+ * @since CUPS 2.0/OS X 10.10@
*/
cups_dest_t * /* O - Destination or @code NULL@ */
diff --git a/cups/http-addr.c b/cups/http-addr.c
index 243440ec2..00eabffc9 100644
--- a/cups/http-addr.c
+++ b/cups/http-addr.c
@@ -64,7 +64,7 @@ httpAddrAny(const http_addr_t *addr) /* I - Address to check */
* listen address for sockets created with @link httpAddrListen@. This will
* ensure that domain sockets are removed when closed.
*
- * @since CUPS 2.0@
+ * @since CUPS 2.0/OS 10.10@
*/
int /* O - 0 on success, -1 on failure */
@@ -653,7 +653,7 @@ httpAddrString(const http_addr_t *addr, /* I - Address to convert */
*
* Returns @code NULL@ if the socket is currently unconnected.
*
- * @since CUPS 2.0@
+ * @since CUPS 2.0/OS 10.10@
*/
http_addr_t * /* O - Connected address or @code NULL@ */
@@ -879,7 +879,7 @@ httpGetHostname(http_t *http, /* I - HTTP connection or NULL */
* 'httpResolveHostname()' - Resolve the hostname of the HTTP connection
* address.
*
- * @since CUPS 2.0@
+ * @since CUPS 2.0/OS 10.10@
*/
const char * /* O - Resolved hostname or @code NULL@ */
diff --git a/cups/http-support.c b/cups/http-support.c
index d9d8359b1..18762669f 100644
--- a/cups/http-support.c
+++ b/cups/http-support.c
@@ -1300,7 +1300,7 @@ httpSeparateURI(
/*
* 'httpStateString()' - Return the string describing a HTTP state value.
*
- * @since CUPS 2.0@
+ * @since CUPS 2.0/OS 10.10@
*/
const char * /* O - State string */
@@ -1433,7 +1433,7 @@ httpStatus(http_status_t status) /* I - HTTP status code */
/*
* 'httpURIStatusString()' - Return a string describing a URI status code.
*
- * @since CUPS 2.0@
+ * @since CUPS 2.0/OS 10.10@
*/
const char * /* O - Localized status string */
diff --git a/cups/http.c b/cups/http.c
index a9954ed44..1d6e4f75c 100644
--- a/cups/http.c
+++ b/cups/http.c
@@ -393,7 +393,7 @@ httpClose(http_t *http) /* I - HTTP connection */
/*
* 'httpCompareCredentials()' - Compare two sets of X.509 credentials.
*
- * @since CUPS 2.0@
+ * @since CUPS 2.0/OS 10.10@
*/
int /* O - 1 if they match, 0 if they do not */
@@ -759,7 +759,7 @@ httpGet(http_t *http, /* I - HTTP connection */
*
* The return value is the UNIX time of the last read or write.
*
- * @since CUPS 2.0@
+ * @since CUPS 2.0/OS 10.10@
*/
time_t /* O - Time of last read or write */
@@ -911,7 +911,7 @@ httpGetCookie(http_t *http) /* I - HTTP connecion */
* @link httpIsEncrypted@ function to determine whether a TLS session has
* been established.
*
- * @since CUPS 2.0@
+ * @since CUPS 2.0/OS 10.10@
*/
http_encryption_t /* O - Current encryption mode */
@@ -995,7 +995,7 @@ httpGetField(http_t *http, /* I - HTTP connection */
/*
* 'httpGetKeepAlive()' - Get the current Keep-Alive state of the connection.
*
- * @since CUPS 2.0@
+ * @since CUPS 2.0/OS 10.10@
*/
http_keepalive_t /* O - Keep-Alive state */
@@ -1104,7 +1104,7 @@ httpGetLength2(http_t *http) /* I - HTTP connection */
/*
* 'httpGetPending()' - Get the number of bytes that are buffered for writing.
*
- * @since CUPS 2.0@
+ * @since CUPS 2.0/OS 10.10@
*/
size_t /* O - Number of bytes buffered */
@@ -1117,7 +1117,7 @@ httpGetPending(http_t *http) /* I - HTTP connection */
/*
* 'httpGetReady()' - Get the number of bytes that can be read without blocking.
*
- * @since CUPS 2.0@
+ * @since CUPS 2.0/OS 10.10@
*/
size_t /* O - Number of bytes available */
@@ -1143,7 +1143,7 @@ httpGetReady(http_t *http) /* I - HTTP connection */
* The @link httpIsChunked@ function can be used to determine whether the
* message body is chunked or fixed-length.
*
- * @since CUPS 2.0@
+ * @since CUPS 2.0/OS 10.10@
*/
size_t /* O - Remaining bytes */
@@ -1582,7 +1582,7 @@ httpInitialize(void)
* This function returns non-zero if the message body is composed of
* variable-length chunks.
*
- * @since CUPS 2.0@
+ * @since CUPS 2.0/OS 10.10@
*/
int /* O - 1 if chunked, 0 if not */
@@ -1597,7 +1597,7 @@ httpIsChunked(http_t *http) /* I - HTTP connection */
*
* This function returns non-zero if the connection is currently encrypted.
*
- * @since CUPS 2.0@
+ * @since CUPS 2.0/OS 10.10@
*/
int /* O - 1 if encrypted, 0 if not */
@@ -2769,7 +2769,7 @@ httpSetField(http_t *http, /* I - HTTP connection */
/*
* 'httpSetKeepAlive()' - Set the current Keep-Alive state of a connection.
*
- * @since CUPS 2.0@
+ * @since CUPS 2.0/OS 10.10@
*/
void
@@ -2847,7 +2847,7 @@ httpSetTimeout(
/*
* 'httpShutdown()' - Shutdown one side of an HTTP connection.
*
- * @since CUPS 2.0@
+ * @since CUPS 2.0/OS 10.10@
*/
void
diff --git a/cups/http.h b/cups/http.h
index 2c6bf9bcb..115460631 100644
--- a/cups/http.h
+++ b/cups/http.h
@@ -342,7 +342,7 @@ typedef enum http_status_e /**** HTTP status codes ****/
# endif /* !_CUPS_NO_DEPRECATED */
} http_status_t;
-typedef enum http_trust_e /**** Level of trust for credentials @since CUPS 2.0@ */
+typedef enum http_trust_e /**** Level of trust for credentials @since CUPS 2.0/OS 10.10@ */
{
HTTP_TRUST_OK = 0, /* Credentials are OK/trusted */
HTTP_TRUST_INVALID, /* Credentials are invalid */
@@ -620,7 +620,7 @@ extern void httpSetDefaultField(http_t *http, http_field_t field,
extern http_state_t httpWriteResponse(http_t *http,
http_status_t status) _CUPS_API_1_7;
-/* New in CUPS 2.0 */
+/* New in CUPS 2.0/OS X 10.10 */
extern int httpAddrClose(http_addr_t *addr, int fd) _CUPS_API_2_0;
extern int httpAddrFamily(http_addr_t *addr) _CUPS_API_2_0;
extern int httpCompareCredentials(cups_array_t *cred1, cups_array_t *cred2) _CUPS_API_2_0;
diff --git a/cups/ipp-support.c b/cups/ipp-support.c
index 37c17d483..87cf21e9a 100644
--- a/cups/ipp-support.c
+++ b/cups/ipp-support.c
@@ -2122,7 +2122,7 @@ ippSetPort(int p) /* I - Port number to use */
/*
* 'ippStateString()' - Return the name corresponding to a state value.
*
- * @since CUPS 2.0@
+ * @since CUPS 2.0/OS 10.10@
*/
const char * /* O - State name */
diff --git a/cups/tls-darwin.c b/cups/tls-darwin.c
index fc2028523..fefd6d104 100644
--- a/cups/tls-darwin.c
+++ b/cups/tls-darwin.c
@@ -61,7 +61,7 @@ static OSStatus http_cdsa_write(SSLConnectionRef connection, const void *data,
/*
* 'cupsMakeServerCredentials()' - Make a self-signed certificate and private key pair.
*
- * @since CUPS 2.0@
+ * @since CUPS 2.0/OS 10.10@
*/
int /* O - 1 on success, 0 on failure */
@@ -283,7 +283,7 @@ cleanup:
* Note: The server credentials are used by all threads in the running process.
* This function is threadsafe.
*
- * @since CUPS 2.0@
+ * @since CUPS 2.0/OS X 10.10@
*/
int /* O - 1 on success, 0 on failure */
@@ -452,7 +452,7 @@ _httpCreateCredentials(
/*
* 'httpCredentialsAreValidForName()' - Return whether the credentials are valid for the given name.
*
- * @since CUPS 2.0@
+ * @since CUPS 2.0/OS X 10.10@
*/
int /* O - 1 if valid, 0 otherwise */
@@ -515,7 +515,7 @@ httpCredentialsAreValidForName(
/*
* 'httpCredentialsGetTrust()' - Return the trust of credentials.
*
- * @since CUPS 2.0@
+ * @since CUPS 2.0/OS X 10.10@
*/
http_trust_t /* O - Level of trust */
@@ -599,7 +599,7 @@ httpCredentialsGetTrust(
/*
* 'httpCredentialsGetExpiration()' - Return the expiration date of the credentials.
*
- * @since CUPS 2.0@
+ * @since CUPS 2.0/OS X 10.10@
*/
time_t /* O - Expiration date of credentials */
@@ -624,7 +624,7 @@ httpCredentialsGetExpiration(
/*
* 'httpCredentialsString()' - Return a string representing the credentials.
*
- * @since CUPS 2.0@
+ * @since CUPS 2.0/OS X 10.10@
*/
size_t /* O - Total size of credentials string */
@@ -697,7 +697,7 @@ _httpFreeCredentials(
/*
* 'httpLoadCredentials()' - Load X.509 credentials from a keychain file.
*
- * @since CUPS 2.0@
+ * @since CUPS 2.0/OS 10.10@
*/
int /* O - 0 on success, -1 on error */
@@ -803,7 +803,7 @@ httpLoadCredentials(
/*
* 'httpSaveCredentials()' - Save X.509 credentials to a keychain file.
*
- * @since CUPS 2.0@
+ * @since CUPS 2.0/OS 10.10@
*/
int /* O - -1 on error, 0 on success */
diff --git a/cups/tls-gnutls.c b/cups/tls-gnutls.c
index 73238f9d7..ef28f224f 100644
--- a/cups/tls-gnutls.c
+++ b/cups/tls-gnutls.c
@@ -51,7 +51,7 @@ static ssize_t http_gnutls_write(gnutls_transport_ptr_t ptr, const void *data,
/*
* 'cupsMakeServerCredentials()' - Make a self-signed certificate and private key pair.
*
- * @since CUPS 2.0@
+ * @since CUPS 2.0/OS 10.10@
*/
int /* O - 1 on success, 0 on failure */
@@ -228,7 +228,7 @@ cupsMakeServerCredentials(
* Note: The server credentials are used by all threads in the running process.
* This function is threadsafe.
*
- * @since CUPS 2.0@
+ * @since CUPS 2.0/OS 10.10@
*/
int /* O - 1 on success, 0 on failure */
@@ -357,7 +357,7 @@ _httpFreeCredentials(
/*
* 'httpCredentialsAreValidForName()' - Return whether the credentials are valid for the given name.
*
- * @since CUPS 2.0@
+ * @since CUPS 2.0/OS 10.10@
*/
int /* O - 1 if valid, 0 otherwise */
@@ -383,7 +383,7 @@ httpCredentialsAreValidForName(
/*
* 'httpCredentialsGetTrust()' - Return the trust of credentials.
*
- * @since CUPS 2.0@
+ * @since CUPS 2.0/OS 10.10@
*/
http_trust_t /* O - Level of trust */
@@ -475,7 +475,7 @@ httpCredentialsGetTrust(
/*
* 'httpCredentialsGetExpiration()' - Return the expiration date of the credentials.
*
- * @since CUPS 2.0@
+ * @since CUPS 2.0/OS 10.10@
*/
time_t /* O - Expiration date of credentials */
@@ -500,7 +500,7 @@ httpCredentialsGetExpiration(
/*
* 'httpCredentialsString()' - Return a string representing the credentials.
*
- * @since CUPS 2.0@
+ * @since CUPS 2.0/OS 10.10@
*/
size_t /* O - Total size of credentials string */
@@ -556,7 +556,7 @@ httpCredentialsString(
/*
* 'httpLoadCredentials()' - Load X.509 credentials from a keychain file.
*
- * @since CUPS 2.0@
+ * @since CUPS 2.0/OS 10.10@
*/
int /* O - 0 on success, -1 on error */
@@ -682,7 +682,7 @@ httpLoadCredentials(
/*
* 'httpSaveCredentials()' - Save X.509 credentials to a keychain file.
*
- * @since CUPS 2.0@
+ * @since CUPS 2.0/OS 10.10@
*/
int /* O - -1 on error, 0 on success */
diff --git a/cups/tls-sspi.c b/cups/tls-sspi.c
index 8ffbf43d3..e3a8e1fb1 100644
--- a/cups/tls-sspi.c
+++ b/cups/tls-sspi.c
@@ -66,7 +66,7 @@ static DWORD http_sspi_verify(PCCERT_CONTEXT cert, const char *common_name, DWOR
/*
* 'cupsMakeServerCredentials()' - Make a self-signed certificate and private key pair.
*
- * @since CUPS 2.0@
+ * @since CUPS 2.0/OS 10.10@
*/
int /* O - 1 on success, 0 on failure */
@@ -102,7 +102,7 @@ cupsMakeServerCredentials(
* Note: The server credentials are used by all threads in the running process.
* This function is threadsafe.
*
- * @since CUPS 2.0@
+ * @since CUPS 2.0/OS 10.10@
*/
int /* O - 1 on success, 0 on failure */
@@ -165,7 +165,7 @@ _httpCreateCredentials(
/*
* 'httpCredentialsAreValidForName()' - Return whether the credentials are valid for the given name.
*
- * @since CUPS 2.0@
+ * @since CUPS 2.0/OS 10.10@
*/
int /* O - 1 if valid, 0 otherwise */
@@ -230,7 +230,7 @@ httpCredentialsAreValidForName(
/*
* 'httpCredentialsGetTrust()' - Return the trust of credentials.
*
- * @since CUPS 2.0@
+ * @since CUPS 2.0/OS 10.10@
*/
http_trust_t /* O - Level of trust */
@@ -272,7 +272,7 @@ httpCredentialsGetTrust(
/*
* 'httpCredentialsGetExpiration()' - Return the expiration date of the credentials.
*
- * @since CUPS 2.0@
+ * @since CUPS 2.0/OS 10.10@
*/
time_t /* O - Expiration date of credentials */
@@ -309,7 +309,7 @@ httpCredentialsGetExpiration(
/*
* 'httpCredentialsString()' - Return a string representing the credentials.
*
- * @since CUPS 2.0@
+ * @since CUPS 2.0/OS 10.10@
*/
size_t /* O - Total size of credentials string */
@@ -399,7 +399,7 @@ _httpFreeCredentials(
/*
* 'httpLoadCredentials()' - Load X.509 credentials from a keychain file.
*
- * @since CUPS 2.0@
+ * @since CUPS 2.0/OS 10.10@
*/
int /* O - 0 on success, -1 on error */
@@ -523,7 +523,7 @@ cleanup:
/*
* 'httpSaveCredentials()' - Save X.509 credentials to a keychain file.
*
- * @since CUPS 2.0@
+ * @since CUPS 2.0/OS 10.10@
*/
int /* O - -1 on error, 0 on success */
diff --git a/doc/help/api-cups.html b/doc/help/api-cups.html
index dd9a4fb12..19f7ccb90 100644
--- a/doc/help/api-cups.html
+++ b/doc/help/api-cups.html
@@ -2097,7 +2097,7 @@ example, passing CUPS_MEDIA_FLAGS_BORDERLESS
will return the defaul
borderless size, typically US Letter or A4, but sometimes 4x6 photo media.
-
+
Get a destination associated with a URI.
cups_dest_t *cupsGetDestWithURI (
@@ -2525,7 +2525,7 @@ cups_lang_t *cupsLangGet (
Return Value
Language data
-
+
Get the localized string for a destination media
size.
diff --git a/doc/help/api-httpipp.html b/doc/help/api-httpipp.html
index bcef02d48..ef21b674c 100644
--- a/doc/help/api-httpipp.html
+++ b/doc/help/api-httpipp.html
@@ -1490,7 +1490,7 @@ int httpAddrAny (
Return Value
1 if "any", 0 otherwise
-
+
Close a socket created by httpAddrConnect
or
httpAddrListen
.
@@ -1820,7 +1820,7 @@ void httpClose (
http
HTTP connection
-
+
Compare two sets of X.509 credentials.
int httpCompareCredentials (
@@ -2107,7 +2107,7 @@ int httpGet (
Return Value
Status of call (0 = success)
-
+
Get the most recent activity for a connection.
time_t httpGetActivity (
@@ -2124,7 +2124,7 @@ time_t httpGetActivity (
The return value is the UNIX time of the last read or write.
-
+
Get the address of the connected peer of a connection.
http_addr_t *httpGetAddress (
@@ -2255,7 +2255,7 @@ time_t httpGetDateTime (
Return Value
UNIX time
-
+
Get the current encryption mode of a connection.
http_encryption_t httpGetEncryption (
@@ -2362,7 +2362,7 @@ Otherwise, return the FQDN for the local system using both gethostname()
and gethostbyname() to get the local hostname with domain.
-
+
Get the current Keep-Alive state of the connection.
http_keepalive_t httpGetKeepAlive (
@@ -2413,7 +2413,7 @@ off_t httpGetLength2 (
content larger than 2^31 - 1.
-
+
Get the number of bytes that are buffered for writing.
size_t httpGetPending (
@@ -2426,7 +2426,7 @@ size_t httpGetPending (
Return Value
Number of bytes buffered
-
+
Get the number of bytes that can be read without blocking.
size_t httpGetReady (
@@ -2439,7 +2439,7 @@ size_t httpGetReady (
Return Value
Number of bytes available
-
+
Get the number of remaining bytes in the message
body or current chunk.
@@ -2584,7 +2584,7 @@ int httpHead (
default HTTP proxy (if any).
void httpInitialize (void);
-
+
Report whether a message body is chunked.
int httpIsChunked (
@@ -2602,7 +2602,7 @@ int httpIsChunked (
variable-length chunks.
-
+
Report whether a connection is encrypted.
int httpIsEncrypted (
@@ -2856,7 +2856,7 @@ int httpReconnect2 (
Return Value
0 on success, non-zero on failure
-
+
Resolve the hostname of the HTTP connection
address.
@@ -3109,7 +3109,7 @@ void httpSetField (
value
Value
-
+
Set the current Keep-Alive state of a connection.
void httpSetKeepAlive (
@@ -3163,7 +3163,7 @@ must be greater than 0
data pointer and must return 1 to continue or 0 to error (time) out.
-
+
Shutdown one side of an HTTP connection.
void httpShutdown (
@@ -3174,7 +3174,7 @@ void httpShutdown (
http
HTTP connection
-
+
Return the string describing a HTTP state value.
const char *httpStateString (
@@ -3219,7 +3219,7 @@ int httpTrace (
Return Value
Status of call (0 = success)
-
+
Return a string describing a URI status code.
const char *httpURIStatusString (
@@ -5393,7 +5393,7 @@ the ippNew
, ip
The valid version numbers are currently 1.0, 1.1, 2.0, 2.1, and 2.2.
-
+
Return the name corresponding to a state value.
const char *ippStateString (
@@ -5616,7 +5616,7 @@ typedef struct _http_s http_t;
typedef int (*http_timeout_cb_t)(http_t *http, void *user_data);
-
+
Level of trust for credentials
typedef enum http_trust_e http_trust_t;
@@ -6018,7 +6018,7 @@ are server-oriented...
HTTP_STATUS_USE_PROXY
Must use a proxy to access this URI
-
+
Level of trust for credentials
Constants
--
2.39.2