Remove all of the Subversion keywords from various source files.

[thirdparty/cups.git] / cups / http.h

diff --git a/cups/http.h b/cups/http.h
index 93413d322bf404c9219cf76cd822d16edbf418ee..03906393ac3f39ff5c915f9dab8d90443c2f4c31 100644 (file)
--- a/cups/http.h
+++ b/cups/http.h
@@ -1,9 +1,7 @@
 /*
- * "$Id$"
- *
  * Hyper-Text Transport Protocol definitions for CUPS.
  *
- * Copyright 2007-2013 by Apple Inc.
+ * Copyright 2007-2014 by Apple Inc.
  * Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  * These coded instructions, statements, and computer programs are the
@@ -87,8 +85,6 @@ extern "C" {
 #    define s6_addr32  _S6_un._S6_u32
 #  elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__)|| defined(__DragonFly__)
 #    define s6_addr32  __u6_addr.__u6_addr32
-#  elif defined(__osf__)
-#    define s6_addr32  s6_un.sa6_laddr
 #  elif defined(WIN32)
 /*
  * Windows only defines byte and 16-bit word members of the union and
@@ -248,7 +244,7 @@ typedef enum http_status_e          /**** HTTP status codes ****/
   HTTP_STATUS_NOT_AUTHORITATIVE,       /* Information isn't authoritative */
   HTTP_STATUS_NO_CONTENT,              /* Successful command, no new data */
   HTTP_STATUS_RESET_CONTENT,           /* Content was reset/recreated */
-  HTTP_STATUS_PARTIAL_CONTENT,         /* Only a partial file was recieved/sent */
+  HTTP_STATUS_PARTIAL_CONTENT,         /* Only a partial file was received/sent */
 
   HTTP_STATUS_MULTIPLE_CHOICES = 300,  /* Multiple files match request */
   HTTP_STATUS_MOVED_PERMANENTLY,       /* Document has moved permanently */
@@ -344,6 +340,16 @@ 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/OS 10.10@ */
+{
+  HTTP_TRUST_OK = 0,                   /* Credentials are OK/trusted */
+  HTTP_TRUST_INVALID,                  /* Credentials are invalid */
+  HTTP_TRUST_CHANGED,                  /* Credentials have changed */
+  HTTP_TRUST_EXPIRED,                  /* Credentials are expired */
+  HTTP_TRUST_RENEWED,                  /* Credentials have been renewed */
+  HTTP_TRUST_UNKNOWN,                  /* Credentials are unknown/new */
+} http_trust_t;
+
 typedef enum http_uri_status_e         /**** URI separation status @since CUPS 1.2@ ****/
 {
   HTTP_URI_STATUS_OVERFLOW = -8,       /* URI buffer for httpAssembleURI is too small */
@@ -612,19 +618,14 @@ 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;
-extern int             httpCreateCredentials(const char *path,
-                                             cups_array_t **credentials,
-                                             const char *common_name)
-                                             _CUPS_API_2_0;
-extern size_t          httpCredentialsString(cups_array_t *credentials,
-                                             char *buffer, size_t bufsize)
-                                             _CUPS_API_2_0;
+extern int             httpCompareCredentials(cups_array_t *cred1, cups_array_t *cred2) _CUPS_API_2_0;
+extern int             httpCredentialsAreValidForName(cups_array_t *credentials, const char *common_name);
+extern time_t          httpCredentialsGetExpiration(cups_array_t *credentials) _CUPS_API_2_0;
+extern http_trust_t    httpCredentialsGetTrust(cups_array_t *credentials, const char *common_name) _CUPS_API_2_0;
+extern size_t          httpCredentialsString(cups_array_t *credentials, char *buffer, size_t bufsize) _CUPS_API_2_0;
 extern http_field_t    httpFieldValue(const char *name) _CUPS_API_2_0;
 extern time_t          httpGetActivity(http_t *http) _CUPS_API_2_0;
 extern http_addr_t     *httpGetAddress(http_t *http) _CUPS_API_2_0;
@@ -635,19 +636,13 @@ extern size_t             httpGetReady(http_t *http) _CUPS_API_2_0;
 extern size_t          httpGetRemaining(http_t *http) _CUPS_API_2_0;
 extern int             httpIsChunked(http_t *http) _CUPS_API_2_0;
 extern int             httpIsEncrypted(http_t *http) _CUPS_API_2_0;
-extern int             httpLoadCredentials(const char *path,
-                                           cups_array_t **credentials,
-                                           const char *common_name)
-                                           _CUPS_API_2_0;
+extern int             httpLoadCredentials(const char *path, cups_array_t **credentials, const char *common_name) _CUPS_API_2_0;
 extern const char      *httpResolveHostname(http_t *http, char *buffer, size_t bufsize) _CUPS_API_2_0;
-extern int             httpSaveCredentials(const char *path,
-                                           cups_array_t *credentials,
-                                           const char *common_name)
-                                           _CUPS_API_2_0;
+extern int             httpSaveCredentials(const char *path, cups_array_t *credentials, const char *common_name) _CUPS_API_2_0;
 extern void            httpSetKeepAlive(http_t *http, http_keepalive_t keep_alive) _CUPS_API_2_0;
 extern void            httpShutdown(http_t *http) _CUPS_API_2_0;
-extern const char      *httpStateString(http_state_t state);
-
+extern const char      *httpStateString(http_state_t state) _CUPS_API_2_0;
+extern const char      *httpURIStatusString(http_uri_status_t status) _CUPS_API_2_0;
 
 /*
  * C++ magic...
@@ -657,7 +652,3 @@ extern const char   *httpStateString(http_state_t state);
 }
 #  endif /* __cplusplus */
 #endif /* !_CUPS_HTTP_H_ */
-
-/*
- * End of "$Id$".
- */