Drop old private APIs that are no longer used/supported.
authormsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Fri, 18 Oct 2013 17:18:20 +0000 (17:18 +0000)
committermsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Fri, 18 Oct 2013 17:18:20 +0000 (17:18 +0000)
Sync up exports file for Windows.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@11341 a1ca3aef-8c08-0410-bb20-df032aa958be

cups/http-addr.c
cups/http-private.h
cups/http-support.c
cups/http.c
cups/http.h
cups/libcups2.def
scheduler/ipp.c
scheduler/printers.c

index e5c3791..01eb74d 100644 (file)
@@ -470,9 +470,6 @@ httpAddrPort(http_addr_t *addr)             /* I - Address */
     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.
index 7c9b725..090c6f6 100644 (file)
@@ -392,18 +392,7 @@ extern void        _cups_freeifaddrs(struct ifaddrs *addrs);
  * 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,
@@ -412,8 +401,6 @@ extern void         _httpDisconnect(http_t *http);
 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),
index 70838fe..bea6b7a 100644 (file)
@@ -538,13 +538,6 @@ httpAssembleUUID(const char *server,       /* I - Server name */
   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.
index 36729b1..6e532c7 100644 (file)
@@ -1884,10 +1884,6 @@ httpPeek(http_t *http,                   /* I - HTTP connection */
   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.
@@ -3933,12 +3929,6 @@ http_create(
   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
 /*
index 9848514..93413d3 100644 (file)
@@ -613,6 +613,8 @@ extern http_state_t httpWriteResponse(http_t *http,
                                          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;
@@ -623,8 +625,6 @@ extern int          httpCreateCredentials(const char *path,
 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;
index ea525c1..5b7f9fc 100644 (file)
@@ -35,7 +35,6 @@ _cups_strcpy
 _cups_strlcat\r
 _cups_strlcpy\r
 _httpAddrSetPort\r
-_httpAssembleUUID\r
 _httpEncodeURI\r
 _httpResolveURI\r
 _httpWait\r
@@ -195,9 +194,11 @@ cupsWriteRequestData
 httpAcceptConnection\r
 httpAddCredential\r
 httpAddrAny\r
+httpAddrClose\r
 httpAddrConnect\r
 httpAddrCopyList\r
 httpAddrEqual\r
+httpAddrFamily\r
 httpAddrFreeList\r
 httpAddrGetList\r
 httpAddrLength\r
@@ -214,10 +215,13 @@ httpCheck
 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
@@ -225,29 +229,40 @@ httpEncode64
 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
@@ -260,6 +275,8 @@ httpRead
 httpRead2\r
 httpReadRequest\r
 httpReconnect\r
+httpResolveHostname\r
+httpSaveCredentials\r
 httpSeparate\r
 httpSeparate2\r
 httpSeparateURI\r
@@ -268,8 +285,11 @@ httpSetCredentials
 httpSetDefaultField\r
 httpSetExpect\r
 httpSetField\r
+httpSetKeepAlive\r
 httpSetLength\r
 httpSetTimeout\r
+httpShutdown\r
+httpStateString\r
 httpStatus\r
 httpTrace\r
 httpUpdate\r
@@ -359,6 +379,7 @@ ippSetStringf
 ippSetStringfv\r
 ippSetValueTag\r
 ippSetVersion\r
+ippStateString\r
 ippTagString\r
 ippTagValue\r
 ippTimeToDate\r
index fc61141..5f53193 100644 (file)
@@ -2184,8 +2184,8 @@ add_job_uuid(cupsd_job_t *job)            /* I - Job */
 
   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)));
 }
 
 
index 4a7d968..b478176 100644 (file)
@@ -131,8 +131,8 @@ cupsdAddPrinter(const char *name)   /* I - Name of printer */
   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;