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 04:05:55 UTC
svn commit: r412253 - /apr/apr-util/branches/1.2.x/dbd/apr_dbd_sqlite2.c
Author: bojan
Date: Tue Jun 6 19:05:55 2006
New Revision: 412253
URL: http://svn.apache.org/viewvc?rev=412253&view=rev
Log:
Merge r412252 from trunk to 1.2.x branch.
Original message: Properly free results table.
Modified:
apr/apr-util/branches/1.2.x/dbd/apr_dbd_sqlite2.c
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=412253&r1=412252&r2=412253&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 Tue Jun 6 19:05:55 2006
@@ -97,7 +97,7 @@
(*results)->random = seek;
if (tuples > 0)
- apr_pool_cleanup_register(pool, *result, (void *) free,
+ apr_pool_cleanup_register(pool, result, (void *) sqlite_free_table,
apr_pool_cleanup_null);
ret = 0;
@@ -298,7 +298,7 @@
{
apr_dbd_t *sql;
sqlite *conn = NULL;
- char *filename, *perm;
+ char *perm;
int iperms = 600;
char* params = apr_pstrdup(pool, params_);
/* params = "[filename]:[permissions]"