return (0);
}
-/* For OS X 10.8 and earlier */
-int _httpAddrPort(http_addr_t *addr) { return (httpAddrPort(addr)); }
-
/*
* '_httpAddrSetPort()' - Set the port number associated with an address.
* Prototypes...
*/
-/* XXX */extern int _httpAddrPort(http_addr_t *addr)
- _CUPS_INTERNAL_MSG("Use httpAddrPort instead.");
extern void _httpAddrSetPort(http_addr_t *addr, int port);
-/* XXX */extern char *_httpAssembleUUID(const char *server, int port,
- const char *name, int number,
- char *buffer, size_t bufsize)
- _CUPS_INTERNAL_MSG("Use httpAssembleUUID instead.");
-/* XXX */extern http_t *_httpCreate(const char *host, int port,
- http_addrlist_t *addrlist,
- http_encryption_t encryption,
- int family)
- _CUPS_INTERNAL_MSG("Use httpConnect2 or httpAccept instead.");
extern http_tls_credentials_t
_httpCreateCredentials(cups_array_t *credentials);
extern char *_httpDecodeURI(char *dst, const char *src,
extern char *_httpEncodeURI(char *dst, const char *src,
size_t dstsize);
extern void _httpFreeCredentials(http_tls_credentials_t credentials);
-/* XXX */extern ssize_t _httpPeek(http_t *http, char *buffer, size_t length)
- _CUPS_INTERNAL_MSG("Use httpPeek instead.");
extern const char *_httpResolveURI(const char *uri, char *resolved_uri,
size_t resolved_size, int options,
int (*cb)(void *context),
return (buffer);
}
-/* For OS X 10.8 and earlier */
-char *_httpAssembleUUID(const char *server, int port, const char *name,
- int number, char *buffer, size_t bufsize)
-{
- return (httpAssembleUUID(server, port, name, number, buffer, bufsize));
-}
-
/*
* 'httpDecode64()' - Base64-decode a string.
return (bytes);
}
-/* For OS X 10.8 and earlier */
-ssize_t _httpPeek(http_t *http, char *buffer, size_t length)
-{ return (httpPeek(http, buffer, length)); }
-
/*
* 'httpPost()' - Send a POST request to the server.
return (http);
}
-/* For OS X 10.8 and earlier */
-http_t *_httpCreate(const char *host, int port, http_addrlist_t *addrlist,
- http_encryption_t encryption, int family)
-{ return (http_create(host, port, addrlist, family, encryption, 1,
- _HTTP_MODE_CLIENT)); }
-
#ifdef DEBUG
/*
http_status_t status) _CUPS_API_1_7;
/* 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 size_t httpCredentialsString(cups_array_t *credentials,
char *buffer, size_t bufsize)
_CUPS_API_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 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;
_cups_strlcat\r
_cups_strlcpy\r
_httpAddrSetPort\r
-_httpAssembleUUID\r
_httpEncodeURI\r
_httpResolveURI\r
_httpWait\r
httpAcceptConnection\r
httpAddCredential\r
httpAddrAny\r
+httpAddrClose\r
httpAddrConnect\r
httpAddrCopyList\r
httpAddrEqual\r
+httpAddrFamily\r
httpAddrFreeList\r
httpAddrGetList\r
httpAddrLength\r
httpClearCookie\r
httpClearFields\r
httpClose\r
+httpCompareCredentials\r
httpConnect\r
httpConnect2\r
httpConnectEncrypt\r
httpCopyCredentials\r
+httpCreateCredentials\r
+httpCredentialsString\r
httpDecode64\r
httpDecode64_2\r
httpDelete\r
httpEncode64_2\r
httpEncryption\r
httpError\r
+httpFieldValue\r
httpFlush\r
httpFlushWrite\r
httpFreeCredentials\r
httpGet\r
+httpGetActivity\r
+httpGetAddress\r
httpGetBlocking\r
httpGetContentEncoding\r
httpGetCookie\r
httpGetDateString\r
httpGetDateString2\r
httpGetDateTime\r
+httpGetEncryption\r
httpGetExpect\r
httpGetFd\r
httpGetField\r
httpGetHostByName\r
httpGetHostname\r
+httpGetKeepAlive\r
httpGetLength\r
httpGetLength2\r
+httpGetPending\r
+httpGetReady\r
+httpGetRemaining\r
httpGetStatus\r
httpGetSubField\r
httpGetSubField2\r
httpGets\r
httpHead\r
httpInitialize\r
+httpIsChunked\r
+httpIsEncrypted\r
+httpLoadCredentials\r
httpMD5\r
httpMD5Final\r
httpMD5String\r
httpRead2\r
httpReadRequest\r
httpReconnect\r
+httpResolveHostname\r
+httpSaveCredentials\r
httpSeparate\r
httpSeparate2\r
httpSeparateURI\r
httpSetDefaultField\r
httpSetExpect\r
httpSetField\r
+httpSetKeepAlive\r
httpSetLength\r
httpSetTimeout\r
+httpShutdown\r
+httpStateString\r
httpStatus\r
httpTrace\r
httpUpdate\r
ippSetStringfv\r
ippSetValueTag\r
ippSetVersion\r
+ippStateString\r
ippTagString\r
ippTagValue\r
ippTimeToDate\r
if (!ippFindAttribute(job->attrs, "job-uuid", IPP_TAG_URI))
ippAddString(job->attrs, IPP_TAG_JOB, IPP_TAG_URI, "job-uuid", NULL,
- _httpAssembleUUID(ServerName, RemotePort, job->dest, job->id,
- uuid, sizeof(uuid)));
+ httpAssembleUUID(ServerName, RemotePort, job->dest, job->id,
+ uuid, sizeof(uuid)));
}
httpAssembleURIf(HTTP_URI_CODING_ALL, uri, sizeof(uri), "ipp", NULL,
ServerName, RemotePort, "/printers/%s", name);
cupsdSetString(&p->uri, uri);
- cupsdSetString(&p->uuid, _httpAssembleUUID(ServerName, RemotePort, name, 0,
- uuid, sizeof(uuid)));
+ cupsdSetString(&p->uuid, httpAssembleUUID(ServerName, RemotePort, name, 0,
+ uuid, sizeof(uuid)));
cupsdSetDeviceURI(p, "file:///dev/null");
p->state = IPP_PRINTER_STOPPED;