Be a bit more correct in our handling of varargs in the DBD code.

* include/private/apr_dbd_internal.h
  (apr_dbd_driver_t::pvquery,
   apr_dbd_driver_t::pvselect): take a va_list, not ...

* dbd/apr_dbd_sqlite2.c
  (dbd_sqlite_pvquery,
   dbd_sqlite_pvselect): take a va_list arg.  not that it really matters
   since this just returns ENOTIMPL...

* dbd/apr_dbd_sqlite3.c
  (dbd_sqlite3_pvquery,
   dbd_sqlite3_pvselect): ditto.

* dbd/apr_dbd_pgsql.c
  (dbd_pgsql_pvquery,
   dbd_pgsql_pvselect): take va_list args, as such stop doing va_start and
   va_end, since it's already been done in the upper level wrapper function.


git-svn-id: http://svn.apache.org/repos/asf/apr/apr-util/trunk@231376 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 3 insertions, 2 deletions

diff --git a/dbd/apr_dbd_sqlite3.c b/dbd/apr_dbd_sqlite3.c
index 47b1e5b9..5b7d4d12 100644
--- a/dbd/apr_dbd_sqlite3.c
+++ b/dbd/apr_dbd_sqlite3.c
@@ -299,7 +299,7 @@ static int dbd_sqlite3_pquery(apr_pool_t *pool, apr_dbd_t *sql,
 }
 
 static int dbd_sqlite3_pvquery(apr_pool_t *pool, apr_dbd_t *sql, int *nrows,
-                               apr_dbd_prepared_t *statement, ...)
+                               apr_dbd_prepared_t *statement, va_list args)
 {
     return APR_ENOTIMPL;
 }
@@ -314,7 +314,8 @@ static int dbd_sqlite3_pselect(apr_pool_t *pool, apr_dbd_t *sql,
 
 static int dbd_sqlite3_pvselect(apr_pool_t *pool, apr_dbd_t *sql,
                                 apr_dbd_results_t **results,
-                                apr_dbd_prepared_t *statement, int seek, ...)
+                                apr_dbd_prepared_t *statement, int seek,
+                                va_list args)
 {
     return APR_ENOTIMPL;
 }