You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by bo...@apache.org on 2006/06/07 14:33:22 UTC
svn commit: r412391 - in /apr/apr-util/branches/1.2.x/dbd: apr_dbd_pgsql.c
apr_dbd_sqlite2.c
Author: bojan
Date: Wed Jun 7 05:33:21 2006
New Revision: 412391
URL: http://svn.apache.org/viewvc?rev=412391&view=rev
Log:
Merge r412390 from trunk to 1.2.x branch
Original message:
Adjust cleanup_kill calls to new wrappers.
Modified:
apr/apr-util/branches/1.2.x/dbd/apr_dbd_pgsql.c
apr/apr-util/branches/1.2.x/dbd/apr_dbd_sqlite2.c
Modified: apr/apr-util/branches/1.2.x/dbd/apr_dbd_pgsql.c
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.2.x/dbd/apr_dbd_pgsql.c?rev=412391&r1=412390&r2=412391&view=diff
==============================================================================
--- apr/apr-util/branches/1.2.x/dbd/apr_dbd_pgsql.c (original)
+++ apr/apr-util/branches/1.2.x/dbd/apr_dbd_pgsql.c Wed Jun 7 05:33:21 2006
@@ -152,7 +152,7 @@
if (res->random) {
if (row->n >= res->ntuples) {
*rowp = NULL;
- apr_pool_cleanup_kill(pool, res->res, (void*)PQclear);
+ apr_pool_cleanup_kill(pool, res->res, clear_result);
PQclear(res->res);
res->res = NULL;
return -1;
Modified: apr/apr-util/branches/1.2.x/dbd/apr_dbd_sqlite2.c
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.2.x/dbd/apr_dbd_sqlite2.c?rev=412391&r1=412390&r2=412391&view=diff
==============================================================================
--- apr/apr-util/branches/1.2.x/dbd/apr_dbd_sqlite2.c (original)
+++ apr/apr-util/branches/1.2.x/dbd/apr_dbd_sqlite2.c Wed Jun 7 05:33:21 2006
@@ -137,7 +137,8 @@
if (row->n >= res->ntuples) {
*rowp = NULL;
- apr_pool_cleanup_kill(pool, res->res, (void *) free);
+ apr_pool_cleanup_kill(pool, res->res, free_table);
+ sqlite_free_table(res->res);
res->res = NULL;
return -1;
}
@@ -222,8 +223,7 @@
apr_dbd_t * sql)
{
char *ret = sqlite_mprintf("%q", arg);
- apr_pool_cleanup_register(pool, ret, free_mem,
- apr_pool_cleanup_null);
+ apr_pool_cleanup_register(pool, ret, free_mem, apr_pool_cleanup_null);
return ret;
}