Fix potential deadlock (OpenPrinting #243)

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

diff --git a/cups/http-private.h b/cups/http-private.h
index 05936ad61cfe5cbadc9d7076107f5cf2b8b5768d..212fea7c49e2ac180bb831a3d40f20a59bfe70ab 100644 (file)
--- a/cups/http-private.h
+++ b/cups/http-private.h
@@ -102,10 +102,6 @@ typedef int socklen_t;
 #    endif /* HAVE_GETIFADDRS */
 #  endif /* !_WIN32 */
 
-#  ifdef HAVE_LIBZ
-#    include <zlib.h>
-#  endif /* HAVE_LIBZ */
-
 
 /*
  * C++ magic...
@@ -158,21 +154,6 @@ typedef gnutls_certificate_credentials_t *http_tls_credentials_t;
  * for its IO and protocol management...
  */
 
-#    if !defined(HAVE_SECBASEPRIV_H) && defined(HAVE_CSSMERRORSTRING) /* Declare prototype for function in that header... */
-extern const char *cssmErrorString(int error);
-#    endif /* !HAVE_SECBASEPRIV_H && HAVE_CSSMERRORSTRING */
-#    if !defined(HAVE_SECIDENTITYSEARCHPRIV_H) && defined(HAVE_SECIDENTITYSEARCHCREATEWITHPOLICY) /* Declare prototype for function in that header... */
-extern OSStatus SecIdentitySearchCreateWithPolicy(SecPolicyRef policy,
-                               CFStringRef idString, CSSM_KEYUSE keyUsage,
-                               CFTypeRef keychainOrArray,
-                               Boolean returnOnlyValidIdentities,
-                               SecIdentitySearchRef* searchRef);
-#    endif /* !HAVE_SECIDENTITYSEARCHPRIV_H && HAVE_SECIDENTITYSEARCHCREATEWITHPOLICY */
-#    if !defined(HAVE_SECPOLICYPRIV_H) && defined(HAVE_SECPOLICYSETVALUE) /* Declare prototype for function in that header... */
-extern OSStatus SecPolicySetValue(SecPolicyRef policyRef,
-                                  const CSSM_DATA *value);
-#    endif /* !HAVE_SECPOLICYPRIV_H && HAVE_SECPOLICYSETVALUE */
-
 typedef SSLContextRef  http_tls_t;
 typedef CFArrayRef     http_tls_credentials_t;
 
@@ -303,8 +284,8 @@ struct _http_s                              /**** HTTP connection structure ****/
   _http_mode_t         mode;           /* _HTTP_MODE_CLIENT or _HTTP_MODE_SERVER */
 #  ifdef HAVE_LIBZ
   _http_coding_t       coding;         /* _HTTP_CODING_xxx */
-  z_stream             stream;         /* (De)compression stream */
-  Bytef                        *sbuffer;       /* (De)compression buffer */
+  void                 *stream;        /* (De)compression stream */
+  unsigned char                *sbuffer;       /* (De)compression buffer */
 #  endif /* HAVE_LIBZ */
 
   /**** New in CUPS 2.2.9 ****/
@@ -335,48 +316,6 @@ extern const char *_cups_hstrerror(int error);
 #  endif /* !HAVE_HSTRERROR */
 
 
-/*
- * Some OS's don't have getifaddrs() and freeifaddrs()...
- */
-
-#  if !defined(_WIN32) && !defined(HAVE_GETIFADDRS)
-#    ifdef ifa_dstaddr
-#      undef ifa_dstaddr
-#    endif /* ifa_dstaddr */
-#    ifndef ifr_netmask
-#      define ifr_netmask ifr_addr
-#    endif /* !ifr_netmask */
-
-struct ifaddrs                         /**** Interface Structure ****/
-{
-  struct ifaddrs       *ifa_next;      /* Next interface in list */
-  char                 *ifa_name;      /* Name of interface */
-  unsigned int         ifa_flags;      /* Flags (up, point-to-point, etc.) */
-  struct sockaddr      *ifa_addr,      /* Network address */
-                       *ifa_netmask;   /* Address mask */
-  union
-  {
-    struct sockaddr    *ifu_broadaddr; /* Broadcast address of this interface. */
-    struct sockaddr    *ifu_dstaddr;   /* Point-to-point destination address. */
-  } ifa_ifu;
-
-  void                 *ifa_data;      /* Interface statistics */
-};
-
-#    ifndef ifa_broadaddr
-#      define ifa_broadaddr ifa_ifu.ifu_broadaddr
-#    endif /* !ifa_broadaddr */
-#    ifndef ifa_dstaddr
-#      define ifa_dstaddr ifa_ifu.ifu_dstaddr
-#    endif /* !ifa_dstaddr */
-
-extern int     _cups_getifaddrs(struct ifaddrs **addrs) _CUPS_PRIVATE;
-#    define getifaddrs _cups_getifaddrs
-extern void    _cups_freeifaddrs(struct ifaddrs *addrs) _CUPS_PRIVATE;
-#    define freeifaddrs _cups_freeifaddrs
-#  endif /* !_WIN32 && !HAVE_GETIFADDRS */
-
-
 /*
  * Prototypes...
  */
@@ -399,7 +338,6 @@ extern const char   *_httpStatus(cups_lang_t *lang, http_status_t status) _CUPS_PR
 extern void            _httpTLSInitialize(void) _CUPS_PRIVATE;
 extern size_t          _httpTLSPending(http_t *http) _CUPS_PRIVATE;
 extern int             _httpTLSRead(http_t *http, char *buf, int len) _CUPS_PRIVATE;
-extern int             _httpTLSSetCredentials(http_t *http) _CUPS_PRIVATE;
 extern void            _httpTLSSetOptions(int options, int min_version, int max_version) _CUPS_PRIVATE;
 extern int             _httpTLSStart(http_t *http) _CUPS_PRIVATE;
 extern void            _httpTLSStop(http_t *http) _CUPS_PRIVATE;