apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From minf...@apache.org
Subject svn commit: r1103367 - in /apr/apr/trunk: crypto/apr_crypto.c crypto/apr_crypto_nss.c crypto/apr_crypto_openssl.c include/apr_crypto.h include/private/apr_crypto_internal.h
Date Sun, 15 May 2011 13:11:59 GMT
Author: minfrin
Date: Sun May 15 13:11:58 2011
New Revision: 1103367

URL: http://svn.apache.org/viewvc?rev=1103367&view=rev
Log:
Remove the pool from the apr_crypto shutdown call.

Modified:
    apr/apr/trunk/crypto/apr_crypto.c
    apr/apr/trunk/crypto/apr_crypto_nss.c
    apr/apr/trunk/crypto/apr_crypto_openssl.c
    apr/apr/trunk/include/apr_crypto.h
    apr/apr/trunk/include/private/apr_crypto_internal.h

Modified: apr/apr/trunk/crypto/apr_crypto.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/crypto/apr_crypto.c?rev=1103367&r1=1103366&r2=1103367&view=diff
==============================================================================
--- apr/apr/trunk/crypto/apr_crypto.c (original)
+++ apr/apr/trunk/crypto/apr_crypto.c Sun May 15 13:11:58 2011
@@ -436,12 +436,11 @@ APR_DECLARE(apr_status_t) apr_crypto_cle
  * @brief Shutdown the crypto library.
  * @note After shutdown, it is expected that the init function can be called again.
  * @param driver - driver to use
- * @param p The pool to use.
  * @return Returns APR_ENOTIMPL if not supported.
  */
-APR_DECLARE(apr_status_t) apr_crypto_shutdown(const apr_crypto_driver_t *driver,
-        apr_pool_t *p) {
-    return driver->shutdown(p);
+APR_DECLARE(apr_status_t) apr_crypto_shutdown(const apr_crypto_driver_t *driver)
+{
+    return driver->shutdown();
 }
 
 #endif /* APU_HAVE_CRYPTO */

Modified: apr/apr/trunk/crypto/apr_crypto_nss.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/crypto/apr_crypto_nss.c?rev=1103367&r1=1103366&r2=1103367&view=diff
==============================================================================
--- apr/apr/trunk/crypto/apr_crypto_nss.c (original)
+++ apr/apr/trunk/crypto/apr_crypto_nss.c Sun May 15 13:11:58 2011
@@ -84,7 +84,7 @@ static apr_status_t crypto_error(const a
  *
  * It is safe to shut down twice.
  */
-static apr_status_t crypto_shutdown(apr_pool_t *pool)
+static apr_status_t crypto_shutdown()
 {
     if (NSS_IsInitialized()) {
         SECStatus s = NSS_Shutdown();
@@ -98,7 +98,7 @@ static apr_status_t crypto_shutdown(apr_
 static apr_status_t crypto_shutdown_helper(void *data)
 {
     apr_pool_t *pool = (apr_pool_t *) data;
-    return crypto_shutdown(pool);
+    return crypto_shutdown();
 }
 
 /**

Modified: apr/apr/trunk/crypto/apr_crypto_openssl.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/crypto/apr_crypto_openssl.c?rev=1103367&r1=1103366&r2=1103367&view=diff
==============================================================================
--- apr/apr/trunk/crypto/apr_crypto_openssl.c (original)
+++ apr/apr/trunk/crypto/apr_crypto_openssl.c Sun May 15 13:11:58 2011
@@ -76,7 +76,7 @@ static apr_status_t crypto_error(const a
 /**
  * Shutdown the crypto library and release resources.
  */
-static apr_status_t crypto_shutdown(apr_pool_t *pool) {
+static apr_status_t crypto_shutdown() {
     ERR_free_strings();
     EVP_cleanup();
     ENGINE_cleanup();
@@ -85,7 +85,7 @@ static apr_status_t crypto_shutdown(apr_
 
 static apr_status_t crypto_shutdown_helper(void *data) {
     apr_pool_t *pool = (apr_pool_t *) data;
-    return crypto_shutdown(pool);
+    return crypto_shutdown();
 }
 
 /**

Modified: apr/apr/trunk/include/apr_crypto.h
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/apr_crypto.h?rev=1103367&r1=1103366&r2=1103367&view=diff
==============================================================================
--- apr/apr/trunk/include/apr_crypto.h (original)
+++ apr/apr/trunk/include/apr_crypto.h Sun May 15 13:11:58 2011
@@ -429,11 +429,9 @@ APR_DECLARE(apr_status_t) apr_crypto_cle
  * @brief Shutdown the crypto library.
  * @note After shutdown, it is expected that the init function can be called again.
  * @param driver - driver to use
- * @param p The pool to use.
  * @return Returns APR_ENOTIMPL if not supported.
  */
-APR_DECLARE(apr_status_t) apr_crypto_shutdown(const apr_crypto_driver_t *driver,
-        apr_pool_t *p);
+APR_DECLARE(apr_status_t) apr_crypto_shutdown(const apr_crypto_driver_t *driver);
 
 #endif /* APU_HAVE_CRYPTO */
 

Modified: apr/apr/trunk/include/private/apr_crypto_internal.h
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/private/apr_crypto_internal.h?rev=1103367&r1=1103366&r2=1103367&view=diff
==============================================================================
--- apr/apr/trunk/include/private/apr_crypto_internal.h (original)
+++ apr/apr/trunk/include/private/apr_crypto_internal.h Sun May 15 13:11:58 2011
@@ -234,10 +234,9 @@ struct apr_crypto_driver_t {
     /**
      * @brief Clean encryption / decryption context.
      * @note After cleanup, a context is free to be reused if necessary.
-     * @param pool The pool to use.
      * @return Returns APR_ENOTIMPL if not supported.
      */
-    apr_status_t (*shutdown)(apr_pool_t *p);
+    apr_status_t (*shutdown)();
 
     /**
      * @brief: fetch the most recent error from this driver.



Mime
View raw message