Return-Path: X-Original-To: apmail-apr-commits-archive@www.apache.org Delivered-To: apmail-apr-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 415E59BAB for ; Thu, 8 Dec 2011 15:21:44 +0000 (UTC) Received: (qmail 82312 invoked by uid 500); 8 Dec 2011 15:21:43 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 82276 invoked by uid 500); 8 Dec 2011 15:21:43 -0000 Mailing-List: contact commits-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: Reply-To: dev@apr.apache.org List-Id: Delivered-To: mailing list commits@apr.apache.org Received: (qmail 82268 invoked by uid 99); 8 Dec 2011 15:21:43 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 08 Dec 2011 15:21:43 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 08 Dec 2011 15:21:42 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 9AD9723888D2 for ; Thu, 8 Dec 2011 15:21:21 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1211930 - /apr/apr-util/branches/1.4.x/crypto/apr_crypto.c Date: Thu, 08 Dec 2011 15:21:21 -0000 To: commits@apr.apache.org From: mturk@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111208152121.9AD9723888D2@eris.apache.org> 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 */