You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by mi...@apache.org on 2011/06/09 00:38:05 UTC
svn commit: r1133589 - in /apr/apr-util/branches/1.5.x: ./
crypto/apr_crypto.c include/apr_crypto.h test/testcrypto.c
Author: minfrin
Date: Wed Jun 8 22:38:04 2011
New Revision: 1133589
URL: http://svn.apache.org/viewvc?rev=1133589&view=rev
Log:
Backport: apr_crypto: Remove an unused parameter from the apr_crypto_init()
function.
Modified:
apr/apr-util/branches/1.5.x/ (props changed)
apr/apr-util/branches/1.5.x/crypto/apr_crypto.c
apr/apr-util/branches/1.5.x/include/apr_crypto.h
apr/apr-util/branches/1.5.x/test/testcrypto.c
Propchange: apr/apr-util/branches/1.5.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jun 8 22:38:04 2011
@@ -1,3 +1,3 @@
-/apr/apr/trunk:781403,781409,784519,784592,789965,794508,917837-917838,1127648,1128838,1129433
+/apr/apr/trunk:781403,781409,784519,784592,789965,794508,917837-917838,1127648,1128838,1129433,1133587
/apr/apr-util/branches/1.3.x:896410
/apr/apr-util/trunk:731033-731034,731225,731236,731291,731293,731379,743986,744009,745771,747612,747623,747630
Modified: apr/apr-util/branches/1.5.x/crypto/apr_crypto.c
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.5.x/crypto/apr_crypto.c?rev=1133589&r1=1133588&r2=1133589&view=diff
==============================================================================
--- apr/apr-util/branches/1.5.x/crypto/apr_crypto.c (original)
+++ apr/apr-util/branches/1.5.x/crypto/apr_crypto.c Wed Jun 8 22:38:04 2011
@@ -83,8 +83,7 @@ static apr_status_t apr_crypto_term(void
return APR_SUCCESS;
}
-APU_DECLARE(apr_status_t) apr_crypto_init(apr_pool_t *pool,
- const apr_array_header_t *params) {
+APU_DECLARE(apr_status_t) apr_crypto_init(apr_pool_t *pool) {
apr_status_t ret = APR_SUCCESS;
apr_pool_t *parent;
Modified: apr/apr-util/branches/1.5.x/include/apr_crypto.h
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.5.x/include/apr_crypto.h?rev=1133589&r1=1133588&r2=1133589&view=diff
==============================================================================
--- apr/apr-util/branches/1.5.x/include/apr_crypto.h (original)
+++ apr/apr-util/branches/1.5.x/include/apr_crypto.h Wed Jun 8 22:38:04 2011
@@ -186,11 +186,9 @@ typedef struct apr_crypto_block_t apr_cr
* @brief Perform once-only initialisation. Call once only.
*
* @param pool - pool to register any shutdown cleanups, etc
- * @param params - array of initialisation parameters
* @return APR_NOTIMPL in case of no crypto support.
*/
-APU_DECLARE(apr_status_t) apr_crypto_init(apr_pool_t *pool,
- const apr_array_header_t *params);
+APU_DECLARE(apr_status_t) apr_crypto_init(apr_pool_t *pool);
/**
* @brief Get the driver struct for a name
Modified: apr/apr-util/branches/1.5.x/test/testcrypto.c
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.5.x/test/testcrypto.c?rev=1133589&r1=1133588&r2=1133589&view=diff
==============================================================================
--- apr/apr-util/branches/1.5.x/test/testcrypto.c (original)
+++ apr/apr-util/branches/1.5.x/test/testcrypto.c Wed Jun 8 22:38:04 2011
@@ -35,7 +35,7 @@ static const apr_crypto_driver_t *get_dr
const apu_err_t *err = NULL;
apr_status_t rv;
- rv = apr_crypto_init(pool, params);
+ rv = apr_crypto_init(pool);
ABTS_ASSERT(tc, "failed to init apr_crypto", rv == APR_SUCCESS);
rv = apr_crypto_get_driver(&driver, name, params, &err, pool);
@@ -358,7 +358,7 @@ static void test_crypto_init(abts_case *
apr_pool_create(&pool, NULL);
- rv = apr_crypto_init(pool, NULL);
+ rv = apr_crypto_init(pool);
ABTS_ASSERT(tc, "failed to init apr_crypto", rv == APR_SUCCESS);
apr_pool_destroy(pool);