apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mar...@apache.org
Subject svn commit: r597627 - /apr/apr-util/trunk/ssl/apr_ssl_openssl.c
Date Fri, 23 Nov 2007 10:15:57 GMT
Author: martin
Date: Fri Nov 23 02:15:57 2007
New Revision: 597627

URL: http://svn.apache.org/viewvc?rev=597627&view=rev
Log:
Not all compilers know the C99 standard yet.

Modified:
    apr/apr-util/trunk/ssl/apr_ssl_openssl.c

Modified: apr/apr-util/trunk/ssl/apr_ssl_openssl.c
URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/ssl/apr_ssl_openssl.c?rev=597627&r1=597626&r2=597627&view=diff
==============================================================================
--- apr/apr-util/trunk/ssl/apr_ssl_openssl.c (original)
+++ apr/apr-util/trunk/ssl/apr_ssl_openssl.c Fri Nov 23 02:15:57 2007
@@ -128,7 +128,6 @@
 apr_status_t apu_ssl_socket_close(apr_ssl_socket_t *sock)
 {
     int sslRv;
-    apr_status_t rv;
 
     if (!sock->sslData->ssl)
         return APR_SUCCESS;
@@ -294,6 +293,7 @@
                                     apr_pool_t *pool)
 {
     apr_evp_factory_t *f = (apr_evp_factory_t *)apr_pcalloc(pool, sizeof(apr_evp_factory_t));
+    apu_evp_data_t *data;
     if (!f) {
         return APR_ENOMEM;
     }
@@ -301,7 +301,7 @@
     f->pool = pool;
     f->purpose = purpose;
 
-    apu_evp_data_t *data = (apu_evp_data_t *)apr_pcalloc(pool, sizeof(apu_evp_data_t));
+    data = (apu_evp_data_t *)apr_pcalloc(pool, sizeof(apu_evp_data_t));
     if (!data) {
         return APR_ENOMEM;
     }
@@ -326,8 +326,9 @@
                 }
                 data->ssl = SSL_new(data->sslCtx);
                 if (data->ssl) {
+                    X509 *cert;
                     data->privkey = SSL_get_privatekey(data->ssl);
-                    X509 *cert = SSL_get_certificate(data->ssl);
+                    cert = SSL_get_certificate(data->ssl);
                     if (cert) {
                         data->pubkey = X509_get_pubkey(cert);
                     }



Mime
View raw message