moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2025-01-08 12:28:06 -05:00
Code Issues Releases Wiki Activity

Avoid variable declaration shadowing previously declared one

Browse Source
This commit is contained in:
Yang Tse 2006-07-19 18:46:56 +00:00
parent 4ac54f8c2c
commit 483a586d55
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/ssluse.c
View File

@ -1488,16 +1488,16 @@ Curl_ossl_connect_step3(struct connectdata *conn,
if(Curl_ssl_getsessionid(conn, &ssl_sessionid, NULL)) { if(Curl_ssl_getsessionid(conn, &ssl_sessionid, NULL)) {
/* Since this is not a cached session ID, then we want to stach this one /* Since this is not a cached session ID, then we want to stach this one
in the cache! */ in the cache! */
SSL_SESSION *ssl_sessionid; SSL_SESSION *our_ssl_sessionid;
#ifdef HAVE_SSL_GET1_SESSION #ifdef HAVE_SSL_GET1_SESSION
ssl_sessionid = SSL_get1_session(connssl->handle); our_ssl_sessionid = SSL_get1_session(connssl->handle);
/* SSL_get1_session() will increment the reference /* SSL_get1_session() will increment the reference
count and the session will stay in memory until explicitly freed with count and the session will stay in memory until explicitly freed with
SSL_SESSION_free(3), regardless of its state. SSL_SESSION_free(3), regardless of its state.
This function was introduced in openssl 0.9.5a. */ This function was introduced in openssl 0.9.5a. */
#else #else
ssl_sessionid = SSL_get_session(connssl->handle); our_ssl_sessionid = SSL_get_session(connssl->handle);
/* if SSL_get1_session() is unavailable, use SSL_get_session(). /* if SSL_get1_session() is unavailable, use SSL_get_session().
This is an inferior option because the session can be flushed This is an inferior option because the session can be flushed
@ -1508,7 +1508,7 @@ Curl_ossl_connect_step3(struct connectdata *conn,
untested. untested.
*/ */
#endif #endif
retcode = Curl_ssl_addsessionid(conn, ssl_sessionid, retcode = Curl_ssl_addsessionid(conn, our_ssl_sessionid,
0 /* unknown size */); 0 /* unknown size */);
if(retcode) { if(retcode) {
failf(data, "failed to store ssl session"); failf(data, "failed to store ssl session");