Remove shadowed variable in http.c

* http.c (gethttp): Rename err to conn_err to prevent shadowed
    variable
This commit is contained in:
Darshit Shah 2015-05-04 21:45:26 +05:30
parent 1cc835dc5b
commit 9b1dd6dab8
2 changed files with 7 additions and 8 deletions

View File

@ -523,13 +523,13 @@ ntlm_output (struct ntlmdata *ntlm, const char *user, const char *passwd,
0x0, 0x0, 0x0, 0x0,
#ifdef USE_NTRESPONSES #ifdef USE_NTRESPONSES
SHORTPAIR (0x18), /* NT-response length, twice */ SHORTPAIR (0x18), /* NT-response length, twice */
SHORTPAIR (0x18), SHORTPAIR (0x18),
#else #else
0x0, 0x0, 0x0, 0x0,
0x0, 0x0, 0x0, 0x0,
#endif #endif
SHORTPAIR (ntrespoff), SHORTPAIR (ntrespoff),
0x0, 0x0, 0x0, 0x0,
SHORTPAIR (domlen), SHORTPAIR (domlen),

View File

@ -2525,16 +2525,15 @@ gethttp (struct url *u, struct http_stat *hs, int *dt, struct url *proxy,
keep_alive = false; keep_alive = false;
{ {
uerr_t err = establish_connection (u, &conn, hs, proxy, &proxyauth, &req, uerr_t conn_err = establish_connection (u, &conn, hs, proxy, &proxyauth, &req,
&using_ssl, inhibit_keep_alive, &sock); &using_ssl, inhibit_keep_alive, &sock);
if (err != RETROK) if (conn_err != RETROK)
{ {
retval = err; retval = conn_err;
goto cleanup; goto cleanup;
} }
} }
/* Open the temporary file where we will write the request. */ /* Open the temporary file where we will write the request. */
if (warc_enabled) if (warc_enabled)
{ {