diff options
| author | mturk <mturk@13f79535-47bb-0310-9956-ffa450edef68> | 2011-12-08 15:21:21 +0000 |
|---|---|---|
| committer | mturk <mturk@13f79535-47bb-0310-9956-ffa450edef68> | 2011-12-08 15:21:21 +0000 |
| commit | 21e1359f96eb29bf33c96919a906d8257c89459e (patch) | |
| tree | 0d9f4f49057b222edd5da0d89f0b8f4ba5ac85a3 | |
| parent | 134295501dbea3cb9857e5057c80cac4162852a7 (diff) | |
| download | libapr-util-21e1359f96eb29bf33c96919a906d8257c89459e.tar.gz | |
Fix broken macro. driver.init takes three params and we don't have second two so pass NULL. We should consider dropping that entirely in favor of apr_crypto_get_driver or make apr_crypto_get_driver statically aware. Something for later versions to deal with
git-svn-id: http://svn.apache.org/repos/asf/apr/apr-util/branches/1.4.x@1211930 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | crypto/apr_crypto.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/crypto/apr_crypto.c b/crypto/apr_crypto.c index 4a1049c4..56888e06 100644 --- a/crypto/apr_crypto.c +++ b/crypto/apr_crypto.c @@ -68,12 +68,12 @@ typedef struct apr_crypto_clear_t { } apr_crypto_clear_t; #if !APU_DSO_BUILD -#define DRIVER_LOAD(name,driver,pool,params) \ +#define DRIVER_LOAD(name,driver,pool) \ { \ extern const apr_crypto_driver_t driver; \ apr_hash_set(drivers,name,APR_HASH_KEY_STRING,&driver); \ if (driver.init) { \ - driver.init(pool, params); \ + driver.init(pool, NULL, NULL); \ } \ } #endif @@ -110,16 +110,16 @@ APU_DECLARE(apr_status_t) apr_crypto_init(apr_pool_t *pool) #if !APU_DSO_BUILD /* Load statically-linked drivers: */ #if APU_HAVE_OPENSSL - DRIVER_LOAD("openssl", apr_crypto_openssl_driver, pool, params); + DRIVER_LOAD("openssl", apr_crypto_openssl_driver, pool); #endif #if APU_HAVE_NSS - DRIVER_LOAD("nss", apr_crypto_nss_driver, pool, params); + DRIVER_LOAD("nss", apr_crypto_nss_driver, pool); #endif #if APU_HAVE_MSCAPI - DRIVER_LOAD("mscapi", apr_crypto_mscapi_driver, pool, params); + DRIVER_LOAD("mscapi", apr_crypto_mscapi_driver, pool); #endif #if APU_HAVE_MSCNG - DRIVER_LOAD("mscng", apr_crypto_mscng_driver, pool, params); + DRIVER_LOAD("mscng", apr_crypto_mscng_driver, pool); #endif #endif /* APU_DSO_BUILD */ |