fixed gcc -Wshadow warnings

This commit is contained in:
Daniel Stenberg 2003-10-18 20:28:53 +00:00
parent 7ad69f59c7
commit 80a06403e4

View File

@ -1846,13 +1846,13 @@ CURLcode Curl_perform(struct SessionHandle *data)
to the new URL */ to the new URL */
urlchanged = data->change.url_changed; urlchanged = data->change.url_changed;
if ((CURLE_OK == res) && urlchanged) { if ((CURLE_OK == res) && urlchanged) {
char *newurl; char *gotourl;
res = Curl_done(conn); res = Curl_done(conn);
if(CURLE_OK == res) { if(CURLE_OK == res) {
newurl = strdup(data->change.url); newurl = strdup(data->change.url);
res = Curl_follow(data, newurl); res = Curl_follow(data, gotourl);
if(res) if(res)
free(newurl); free(gotourl);
} }
} }
} while (urlchanged && res == CURLE_OK) ; } while (urlchanged && res == CURLE_OK) ;
@ -1861,8 +1861,6 @@ CURLcode Curl_perform(struct SessionHandle *data)
res = Curl_do(&conn); res = Curl_do(&conn);
if(res == CURLE_OK) { if(res == CURLE_OK) {
CURLcode res2; /* just a local extra result container */
if(conn->protocol&PROT_FTPS) if(conn->protocol&PROT_FTPS)
/* FTPS, disable ssl while transfering data */ /* FTPS, disable ssl while transfering data */
conn->ssl.use = FALSE; conn->ssl.use = FALSE;