apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bo...@apache.org
Subject svn commit: r412390 - in /apr/apr-util/trunk/dbd: apr_dbd_pgsql.c apr_dbd_sqlite2.c
Date Wed, 07 Jun 2006 12:32:04 GMT
Author: bojan
Date: Wed Jun  7 05:32:04 2006
New Revision: 412390

URL: http://svn.apache.org/viewvc?rev=412390&view=rev
Log:
Adjust cleanup_kill calls to new wrappers.

Modified:
    apr/apr-util/trunk/dbd/apr_dbd_pgsql.c
    apr/apr-util/trunk/dbd/apr_dbd_sqlite2.c

Modified: apr/apr-util/trunk/dbd/apr_dbd_pgsql.c
URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/dbd/apr_dbd_pgsql.c?rev=412390&r1=412389&r2=412390&view=diff
==============================================================================
--- apr/apr-util/trunk/dbd/apr_dbd_pgsql.c (original)
+++ apr/apr-util/trunk/dbd/apr_dbd_pgsql.c Wed Jun  7 05:32:04 2006
@@ -157,7 +157,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/trunk/dbd/apr_dbd_sqlite2.c
URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/dbd/apr_dbd_sqlite2.c?rev=412390&r1=412389&r2=412390&view=diff
==============================================================================
--- apr/apr-util/trunk/dbd/apr_dbd_sqlite2.c (original)
+++ apr/apr-util/trunk/dbd/apr_dbd_sqlite2.c Wed Jun  7 05:32:04 2006
@@ -146,7 +146,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;
     }
@@ -231,8 +232,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;
 }
 



Mime
View raw message