Return-Path: Delivered-To: apmail-apr-commits-archive@www.apache.org Received: (qmail 7522 invoked from network); 7 Jun 2006 11:35:11 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 7 Jun 2006 11:35:11 -0000 Received: (qmail 48267 invoked by uid 500); 7 Jun 2006 11:35:10 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 48227 invoked by uid 500); 7 Jun 2006 11:35:10 -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 48213 invoked by uid 99); 7 Jun 2006 11:35:09 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 07 Jun 2006 04:35:09 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 07 Jun 2006 04:35:09 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 3C3EC1A983A; Wed, 7 Jun 2006 04:34:49 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r412372 - /apr/apr-util/trunk/dbd/apr_dbd_sqlite2.c Date: Wed, 07 Jun 2006 11:34:48 -0000 To: commits@apr.apache.org From: bojan@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060607113449.3C3EC1A983A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: bojan Date: Wed Jun 7 04:34:48 2006 New Revision: 412372 URL: http://svn.apache.org/viewvc?rev=412372&view=rev Log: Don't cast cleanup function, provide wrappers instead. Modified: apr/apr-util/trunk/dbd/apr_dbd_sqlite2.c Modified: apr/apr-util/trunk/dbd/apr_dbd_sqlite2.c URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/dbd/apr_dbd_sqlite2.c?rev=412372&r1=412371&r2=412372&view=diff ============================================================================== --- apr/apr-util/trunk/dbd/apr_dbd_sqlite2.c (original) +++ apr/apr-util/trunk/dbd/apr_dbd_sqlite2.c Wed Jun 7 04:34:48 2006 @@ -67,6 +67,11 @@ } \ } while(0); +static apr_status_t free_table(void *data) +{ + sqlite_free_table(data); + return APR_SUCCESS; +} static int dbd_sqlite_select(apr_pool_t * pool, apr_dbd_t * sql, apr_dbd_results_t ** results, const char *query, @@ -97,7 +102,7 @@ (*results)->random = seek; if (tuples > 0) - apr_pool_cleanup_register(pool, result, (void *) sqlite_free_table, + apr_pool_cleanup_register(pool, result, free_table, apr_pool_cleanup_null); ret = 0; @@ -216,11 +221,17 @@ return ret; } +static apr_status_t free_mem(void *data) +{ + sqlite_freemem(data); + return APR_SUCCESS +} + static const char *dbd_sqlite_escape(apr_pool_t * pool, const char *arg, apr_dbd_t * sql) { char *ret = sqlite_mprintf("%q", arg); - apr_pool_cleanup_register(pool, ret, (void *) sqlite_freemem, + apr_pool_cleanup_register(pool, ret, free_mem, apr_pool_cleanup_null); return ret; }