Full sweep of all Clang warnings, plus some bug fixes for incorrect memcpy usage.

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

diff --git a/cups/http.h b/cups/http.h
index e672ca5f63c15d05104490259ad05b6028fd187f..a660ca9f984154dbb858d4bc79d8be9c4577acee 100644 (file)
--- a/cups/http.h
+++ b/cups/http.h
@@ -3,7 +3,7 @@
  *
  * 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
@@ -613,16 +613,11 @@ extern http_state_t       httpWriteResponse(http_t *http,
 /* New in CUPS 2.0 */
 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             httpCredentialsAreTrusted(cups_array_t *credentials) _CUPS_API_2_0;
+extern time_t          httpCredentialsGetExpiration(cups_array_t *credentials) _CUPS_API_2_0;
+extern int             httpCredentialsIsValidName(cups_array_t *credentials, const char *common_name);
+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;
@@ -633,19 +628,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...