Merge easysw-1.4svn-r7834

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

diff --git a/cups/http.c b/cups/http.c
index 8baf29119589d30b158b4c7f47c5df397b662fcb..26f2107891ed99e2d501165f79d2cd5db6f1efb6 100644 (file)
--- a/cups/http.c
+++ b/cups/http.c
@@ -298,8 +298,7 @@ void
 httpClose(http_t *http)                        /* I - Connection to server */
 {
 #ifdef HAVE_GSSAPI
-  OM_uint32    minor_status,           /* Minor status code */
-               major_status;           /* Major status code */
+  OM_uint32    minor_status;           /* Minor status code */
 #endif /* HAVE_GSSAPI */
 
 
@@ -326,11 +325,10 @@ httpClose(http_t *http)                   /* I - Connection to server */
 
 #ifdef HAVE_GSSAPI
   if (http->gssctx != GSS_C_NO_CONTEXT)
-    major_status = gss_delete_sec_context(&minor_status, &http->gssctx,
-                                          GSS_C_NO_BUFFER);
+    gss_delete_sec_context(&minor_status, &http->gssctx, GSS_C_NO_BUFFER);
 
   if (http->gssname != GSS_C_NO_NAME)
-    major_status = gss_release_name(&minor_status, &http->gssname);
+    gss_release_name(&minor_status, &http->gssname);
 #endif /* HAVE_GSSAPI */
 
 #ifdef HAVE_AUTHORIZATION_H
@@ -2439,10 +2437,9 @@ http_debug_hex(const char *prefix,       /* I - Prefix for line */
   char line[255],                      /* Line buffer */
        *start,                         /* Start of line after prefix */
        *ptr;                           /* Pointer into line */
-  _cups_globals_t *cg = _cupsGlobals();        /* Global data */
 
 
-  if (cg->debug_init && cg->debug_fd < 0)
+  if (_cups_debug_fd < 0)
     return;
 
   DEBUG_printf(("%s: %d bytes:\n", prefix, bytes));
@@ -3035,7 +3032,8 @@ http_wait(http_t *http,                   /* I - Connection to server */
 #  elif defined(HAVE_CDSASSL)
     size_t bytes;                      /* Bytes that are available */
 
-    if (!SSLGetBufferedReadSize(((http_tls_t *)http->tls)->session, &bytes) && bytes > 0)
+    if (!SSLGetBufferedReadSize(((http_tls_t *)(http->tls))->session, &bytes) &&
+        bytes > 0)
       return (1);
 #  endif /* HAVE_LIBSSL */
   }