Remove shadowed variable in http.c

    * http.c (gethttp): Rename err to conn_err to prevent shadowed
    variable

2 files changed, 7 insertions, 8 deletions

diff --git a/src/http-ntlm.c b/src/http-ntlm.c
index 6719de14..56c40ae3 100644
--- a/src/http-ntlm.c
+++ b/src/http-ntlm.c
@@ -523,13 +523,13 @@ ntlm_output (struct ntlmdata *ntlm, const char *user, const char *passwd,
               0x0, 0x0,
 
 #ifdef USE_NTRESPONSES
-                SHORTPAIR (0x18), /* NT-response length, twice */
+              SHORTPAIR (0x18), /* NT-response length, twice */
               SHORTPAIR (0x18),
 #else
-                0x0, 0x0,
+              0x0, 0x0,
               0x0, 0x0,
 #endif
-                SHORTPAIR (ntrespoff),
+              SHORTPAIR (ntrespoff),
               0x0, 0x0,
 
               SHORTPAIR (domlen),
diff --git a/src/http.c b/src/http.c
index f543957d..54eb106a 100644
--- a/src/http.c
+++ b/src/http.c
@@ -2525,16 +2525,15 @@ gethttp (struct url *u, struct http_stat *hs, int *dt, struct url *proxy,
     keep_alive = false;
 
   {
-    uerr_t err = establish_connection (u, &conn, hs, proxy, &proxyauth, &req,
-                                       &using_ssl, inhibit_keep_alive, &sock);
-    if (err != RETROK)
+    uerr_t conn_err = establish_connection (u, &conn, hs, proxy, &proxyauth, &req,
+                                            &using_ssl, inhibit_keep_alive, &sock);
+    if (conn_err != RETROK)
       {
-        retval = err;
+        retval = conn_err;
         goto cleanup;
       }
   }
 
-
   /* Open the temporary file where we will write the request. */
   if (warc_enabled)
     {