apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bo...@apache.org
Subject svn commit: r412612 - in /apr/apr-util/trunk/dbd: apr_dbd_pgsql.c apr_dbd_sqlite2.c
Date Wed, 07 Jun 2006 23:34:44 GMT
Author: bojan
Date: Wed Jun  7 16:34:44 2006
New Revision: 412612

URL: http://svn.apache.org/viewvc?rev=412612&view=rev
Log:
Simplify cleanup run.

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=412612&r1=412611&r2=412612&view=diff
==============================================================================
--- apr/apr-util/trunk/dbd/apr_dbd_pgsql.c (original)
+++ apr/apr-util/trunk/dbd/apr_dbd_pgsql.c Wed Jun  7 16:34:44 2006
@@ -157,8 +157,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/trunk/dbd/apr_dbd_sqlite2.c
URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/dbd/apr_dbd_sqlite2.c?rev=412612&r1=412611&r2=412612&view=diff
==============================================================================
--- apr/apr-util/trunk/dbd/apr_dbd_sqlite2.c (original)
+++ apr/apr-util/trunk/dbd/apr_dbd_sqlite2.c Wed Jun  7 16:34:44 2006
@@ -146,8 +146,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;
     }
@@ -225,7 +224,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,



Mime
View raw message