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/08 01:42:01 UTC
svn commit: r412613 - in /apr/apr-util/branches/1.2.x/dbd: apr_dbd_pgsql.c
apr_dbd_sqlite2.c
Author: bojan
Date: Wed Jun 7 16:42:01 2006
New Revision: 412613
URL: http://svn.apache.org/viewvc?rev=412613&view=rev
Log:
Merge r412612 from trunk to 1.2.x branch
Original message: Simplify cleanup run.
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=412613&r1=412612&r2=412613&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 16:42:01 2006
@@ -152,8 +152,7 @@
if (res->random) {
if (row->n >= res->ntuples) {
*rowp = NULL;
- apr_pool_cleanup_kill(pool, res->res, clear_result);
- PQclear(res->res);
+ apr_pool_cleanup_run(pool, res->res, clear_result);
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=412613&r1=412612&r2=412613&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 16:42:01 2006
@@ -137,8 +137,7 @@
if (row->n >= res->ntuples) {
*rowp = NULL;
- apr_pool_cleanup_kill(pool, res->res, free_table);
- sqlite_free_table(res->res);
+ apr_pool_cleanup_run(pool, res->res, free_table);
res->res = NULL;
return -1;
}
@@ -216,7 +215,7 @@
static apr_status_t free_mem(void *data)
{
sqlite_freemem(data);
- return APR_SUCCESS
+ return APR_SUCCESS;
}
static const char *dbd_sqlite_escape(apr_pool_t * pool, const char *arg,