Drop old private APIs that are no longer used/supported.

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

diff --git a/cups/http-addr.c b/cups/http-addr.c
index e5c3791cfd3648c386ee76e0dfa129bfa7321555..01eb74db50ce1802386f3e4eb3b683e713239029 100644 (file)
--- a/cups/http-addr.c
+++ b/cups/http-addr.c
@@ -470,9 +470,6 @@ httpAddrPort(http_addr_t *addr)             /* I - Address */
     return (0);
 }
 
     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.
 
 /*
  * '_httpAddrSetPort()' - Set the port number associated with an address.

diff --git a/cups/http-private.h b/cups/http-private.h
index 7c9b725cc58de07faa6900d083c8f38eaa434038..090c6f67961d8aba0bfdee8868428abd3f5baa10 100644 (file)
--- a/cups/http-private.h
+++ b/cups/http-private.h
@@ -392,18 +392,7 @@ extern void        _cups_freeifaddrs(struct ifaddrs *addrs);
  * Prototypes...
  */
 
  * Prototypes...
  */
 

-/* XXX */extern int            _httpAddrPort(http_addr_t *addr)
-                                     _CUPS_INTERNAL_MSG("Use httpAddrPort instead.");

 extern void            _httpAddrSetPort(http_addr_t *addr, int port);
 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 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);
 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),
 extern const char      *_httpResolveURI(const char *uri, char *resolved_uri,
                                         size_t resolved_size, int options,
                                         int (*cb)(void *context),

diff --git a/cups/http-support.c b/cups/http-support.c
index 70838feffe86e3a0cf3f5dae702e58375fd466d9..bea6b7a79e25a5c724f7507ad20285e7cb89ee85 100644 (file)
--- a/cups/http-support.c
+++ b/cups/http-support.c
@@ -538,13 +538,6 @@ httpAssembleUUID(const char *server,       /* I - Server name */
   return (buffer);
 }
 
   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.
 
 /*
  * 'httpDecode64()' - Base64-decode a string.

diff --git a/cups/http.c b/cups/http.c
index 36729b122bd19be077de10cee9da91d1c0442d84..6e532c76b9699281dbf7e40b7aa09458ec6111a5 100644 (file)
--- a/cups/http.c
+++ b/cups/http.c
@@ -1884,10 +1884,6 @@ httpPeek(http_t *http,                   /* I - HTTP connection */
   return (bytes);
 }
 
   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.
 
 /*
  * 'httpPost()' - Send a POST request to the server.


@@ -3933,12 +3929,6 @@ http_create(
   return (http);
 }
 
   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
 /*
 
 #ifdef DEBUG
 /*

diff --git a/cups/http.h b/cups/http.h
index 9848514e9d7a8f49cb3f3222b7e7082a77b4af14..93413d322bf404c9219cf76cd822d16edbf418ee 100644 (file)
--- a/cups/http.h
+++ b/cups/http.h
@@ -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 */
                                          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 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 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;
 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;

diff --git a/cups/libcups2.def b/cups/libcups2.def
index ea525c1509271d796695b5ec799e667cacaef734..5b7f9fc1671476f4f19bd666502199c5938d0021 100644 (file)
--- a/cups/libcups2.def
+++ b/cups/libcups2.def
@@ -35,7 +35,6 @@ _cups_strcpy
 _cups_strlcat\r
 _cups_strlcpy\r
 _httpAddrSetPort\r
 _cups_strlcat\r
 _cups_strlcpy\r
 _httpAddrSetPort\r

-_httpAssembleUUID\r

 _httpEncodeURI\r
 _httpResolveURI\r
 _httpWait\r
 _httpEncodeURI\r
 _httpResolveURI\r
 _httpWait\r


@@ -195,9 +194,11 @@ cupsWriteRequestData
 httpAcceptConnection\r
 httpAddCredential\r
 httpAddrAny\r
 httpAcceptConnection\r
 httpAddCredential\r
 httpAddrAny\r

+httpAddrClose\r

 httpAddrConnect\r
 httpAddrCopyList\r
 httpAddrEqual\r
 httpAddrConnect\r
 httpAddrCopyList\r
 httpAddrEqual\r

+httpAddrFamily\r

 httpAddrFreeList\r
 httpAddrGetList\r
 httpAddrLength\r
 httpAddrFreeList\r
 httpAddrGetList\r
 httpAddrLength\r


@@ -214,10 +215,13 @@ httpCheck
 httpClearCookie\r
 httpClearFields\r
 httpClose\r
 httpClearCookie\r
 httpClearFields\r
 httpClose\r

+httpCompareCredentials\r

 httpConnect\r
 httpConnect2\r
 httpConnectEncrypt\r
 httpCopyCredentials\r
 httpConnect\r
 httpConnect2\r
 httpConnectEncrypt\r
 httpCopyCredentials\r

+httpCreateCredentials\r
+httpCredentialsString\r

 httpDecode64\r
 httpDecode64_2\r
 httpDelete\r
 httpDecode64\r
 httpDecode64_2\r
 httpDelete\r


@@ -225,29 +229,40 @@ httpEncode64
 httpEncode64_2\r
 httpEncryption\r
 httpError\r
 httpEncode64_2\r
 httpEncryption\r
 httpError\r

+httpFieldValue\r

 httpFlush\r
 httpFlushWrite\r
 httpFreeCredentials\r
 httpGet\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
 httpGetBlocking\r
 httpGetContentEncoding\r
 httpGetCookie\r
 httpGetDateString\r
 httpGetDateString2\r
 httpGetDateTime\r

+httpGetEncryption\r

 httpGetExpect\r
 httpGetFd\r
 httpGetField\r
 httpGetHostByName\r
 httpGetHostname\r
 httpGetExpect\r
 httpGetFd\r
 httpGetField\r
 httpGetHostByName\r
 httpGetHostname\r

+httpGetKeepAlive\r

 httpGetLength\r
 httpGetLength2\r
 httpGetLength\r
 httpGetLength2\r

+httpGetPending\r
+httpGetReady\r
+httpGetRemaining\r

 httpGetStatus\r
 httpGetSubField\r
 httpGetSubField2\r
 httpGets\r
 httpHead\r
 httpInitialize\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
 httpMD5\r
 httpMD5Final\r
 httpMD5String\r


@@ -260,6 +275,8 @@ httpRead
 httpRead2\r
 httpReadRequest\r
 httpReconnect\r
 httpRead2\r
 httpReadRequest\r
 httpReconnect\r

+httpResolveHostname\r
+httpSaveCredentials\r

 httpSeparate\r
 httpSeparate2\r
 httpSeparateURI\r
 httpSeparate\r
 httpSeparate2\r
 httpSeparateURI\r


@@ -268,8 +285,11 @@ httpSetCredentials
 httpSetDefaultField\r
 httpSetExpect\r
 httpSetField\r
 httpSetDefaultField\r
 httpSetExpect\r
 httpSetField\r

+httpSetKeepAlive\r

 httpSetLength\r
 httpSetTimeout\r
 httpSetLength\r
 httpSetTimeout\r

+httpShutdown\r
+httpStateString\r

 httpStatus\r
 httpTrace\r
 httpUpdate\r
 httpStatus\r
 httpTrace\r
 httpUpdate\r


@@ -359,6 +379,7 @@ ippSetStringf
 ippSetStringfv\r
 ippSetValueTag\r
 ippSetVersion\r
 ippSetStringfv\r
 ippSetValueTag\r
 ippSetVersion\r

+ippStateString\r

 ippTagString\r
 ippTagValue\r
 ippTimeToDate\r
 ippTagString\r
 ippTagValue\r
 ippTimeToDate\r

diff --git a/scheduler/ipp.c b/scheduler/ipp.c
index fc61141285bb685078b12f695115df5796d0207c..5f53193b6bd33a6b2b9c29265b470c0d596e7c1c 100644 (file)
--- a/scheduler/ipp.c
+++ b/scheduler/ipp.c
@@ -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,
 
   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)));

 }
 
 
 }
 
 

diff --git a/scheduler/printers.c b/scheduler/printers.c
index 4a7d96876a0bacff7b0f16a2caa0173ff6aa98b9..b4781769ef23699c73b250ea5c3680d307477c2f 100644 (file)
--- a/scheduler/printers.c
+++ b/scheduler/printers.c
@@ -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);
   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;
   cupsdSetDeviceURI(p, "file:///dev/null");
 
   p->state      = IPP_PRINTER_STOPPED;