apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From n..@apache.org
Subject svn commit: r321236 - in /apr/apr-util/trunk: dbd/apr_dbd.c dbd/apr_dbd_pgsql.c dbd/apr_dbd_sqlite2.c dbd/apr_dbd_sqlite3.c include/private/apr_dbd_internal.h
Date Fri, 14 Oct 2005 22:33:32 GMT
Author: niq
Date: Fri Oct 14 15:33:25 2005
New Revision: 321236

URL: http://svn.apache.org/viewcvs?rev=321236&view=rev
Log:
Undo revision 321121 (reset doesn't do anything useful enough
to merit an API change and updated dependencies).

Modified:
    apr/apr-util/trunk/dbd/apr_dbd.c
    apr/apr-util/trunk/dbd/apr_dbd_pgsql.c
    apr/apr-util/trunk/dbd/apr_dbd_sqlite2.c
    apr/apr-util/trunk/dbd/apr_dbd_sqlite3.c
    apr/apr-util/trunk/include/private/apr_dbd_internal.h

Modified: apr/apr-util/trunk/dbd/apr_dbd.c
URL: http://svn.apache.org/viewcvs/apr/apr-util/trunk/dbd/apr_dbd.c?rev=321236&r1=321235&r2=321236&view=diff
==============================================================================
--- apr/apr-util/trunk/dbd/apr_dbd.c (original)
+++ apr/apr-util/trunk/dbd/apr_dbd.c Fri Oct 14 15:33:25 2005
@@ -189,11 +189,6 @@
     return driver->end_transaction(trans);
 }
 
-APU_DECLARE(apr_status_t) apr_dbd_reset(const apr_dbd_driver_t *driver,
-                                        apr_dbd_t *handle)
-{
-    return driver->reset(handle);
-}
 APU_DECLARE(apr_status_t) apr_dbd_close(const apr_dbd_driver_t *driver,
                                         apr_dbd_t *handle)
 {

Modified: apr/apr-util/trunk/dbd/apr_dbd_pgsql.c
URL: http://svn.apache.org/viewcvs/apr/apr-util/trunk/dbd/apr_dbd_pgsql.c?rev=321236&r1=321235&r2=321236&view=diff
==============================================================================
--- apr/apr-util/trunk/dbd/apr_dbd_pgsql.c (original)
+++ apr/apr-util/trunk/dbd/apr_dbd_pgsql.c Fri Oct 14 15:33:25 2005
@@ -611,10 +611,6 @@
         return -1;
     }
 }
-static apr_status_t dbd_pgsql_reset(apr_dbd_t *handle)
-{
-    return APR_ENOTIMPL;
-}
 
 APU_DECLARE_DATA const apr_dbd_driver_t apr_dbd_pgsql_driver = {
     "pgsql",
@@ -639,6 +635,5 @@
     dbd_pgsql_pvselect,
     dbd_pgsql_pquery,
     dbd_pgsql_pselect,
-    dbd_pgsql_reset,
 };
 #endif

Modified: apr/apr-util/trunk/dbd/apr_dbd_sqlite2.c
URL: http://svn.apache.org/viewcvs/apr/apr-util/trunk/dbd/apr_dbd_sqlite2.c?rev=321236&r1=321235&r2=321236&view=diff
==============================================================================
--- apr/apr-util/trunk/dbd/apr_dbd_sqlite2.c (original)
+++ apr/apr-util/trunk/dbd/apr_dbd_sqlite2.c Fri Oct 14 15:33:25 2005
@@ -359,10 +359,6 @@
 {
     return res->ntuples;
 }
-static apr_status_t dbd_sqlite_reset(apr_dbd_t *handle)
-{
-    return APR_ENOTIMPL;
-}
 
 APU_DECLARE_DATA const apr_dbd_driver_t apr_dbd_sqlite2_driver = {
     "sqlite2",
@@ -387,6 +383,5 @@
     dbd_sqlite_pvselect,
     dbd_sqlite_pquery,
     dbd_sqlite_pselect,
-    dbd_sqlite_reset,
 };
 #endif

Modified: apr/apr-util/trunk/dbd/apr_dbd_sqlite3.c
URL: http://svn.apache.org/viewcvs/apr/apr-util/trunk/dbd/apr_dbd_sqlite3.c?rev=321236&r1=321235&r2=321236&view=diff
==============================================================================
--- apr/apr-util/trunk/dbd/apr_dbd_sqlite3.c (original)
+++ apr/apr-util/trunk/dbd/apr_dbd_sqlite3.c Fri Oct 14 15:33:25 2005
@@ -391,10 +391,6 @@
 {
     return res->tuples;
 }
-static apr_status_t dbd_sqlite3_reset(apr_dbd_t *handle)
-{
-    return APR_ENOTIMPL;
-}
 
 APU_DECLARE_DATA const apr_dbd_driver_t apr_dbd_sqlite3_driver = {
     "sqlite3",
@@ -419,6 +415,5 @@
     dbd_sqlite3_pvselect,
     dbd_sqlite3_pquery,
     dbd_sqlite3_pselect,
-    dbd_sqlite3_reset,
 };
 #endif

Modified: apr/apr-util/trunk/include/private/apr_dbd_internal.h
URL: http://svn.apache.org/viewcvs/apr/apr-util/trunk/include/private/apr_dbd_internal.h?rev=321236&r1=321235&r2=321236&view=diff
==============================================================================
--- apr/apr-util/trunk/include/private/apr_dbd_internal.h (original)
+++ apr/apr-util/trunk/include/private/apr_dbd_internal.h Fri Oct 14 15:33:25 2005
@@ -246,13 +246,6 @@
                    apr_dbd_results_t **res, apr_dbd_prepared_t *statement,
                    int random, int nargs, const char **args);
 
-    /** reset: reset a persistent connection for re-use
-     *
-     *  @param handle - the connection to reset
-     *  @return APR_SUCCESS or error
-     */
-    apr_status_t (*reset)(apr_dbd_t *handle);
-
 };
 
 /* Export mutex lock/unlock for drivers that need it */



Mime
View raw message