apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mt...@apache.org
Subject svn commit: r1211930 - /apr/apr-util/branches/1.4.x/crypto/apr_crypto.c
Date Thu, 08 Dec 2011 15:21:21 GMT
Author: mturk
Date: Thu Dec  8 15:21:21 2011
New Revision: 1211930

URL: http://svn.apache.org/viewvc?rev=1211930&view=rev
Log:
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

Modified:
    apr/apr-util/branches/1.4.x/crypto/apr_crypto.c

Modified: apr/apr-util/branches/1.4.x/crypto/apr_crypto.c
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.4.x/crypto/apr_crypto.c?rev=1211930&r1=1211929&r2=1211930&view=diff
==============================================================================
--- apr/apr-util/branches/1.4.x/crypto/apr_crypto.c (original)
+++ apr/apr-util/branches/1.4.x/crypto/apr_crypto.c Thu Dec  8 15:21:21 2011
@@ -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_ini
 #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 */
 



Mime
View raw message