summaryrefslogtreecommitdiff
path: root/srclib/apr-util/dbd/apr_dbd_odbc.c
diff options
context:
space:
mode:
authorStefan Fritsch <sf@sfritsch.de>2011-12-27 19:43:04 +0100
committerStefan Fritsch <sf@sfritsch.de>2011-12-27 19:43:04 +0100
commit498ea95018b369e62646a98c7d7d5413b56e170c (patch)
treeb7c4798010bbb18d4d2c07f722d7fb0d38efd24c /srclib/apr-util/dbd/apr_dbd_odbc.c
parente8bb7adda7f73e53cdab823e9cab2a49ccbdf188 (diff)
downloadapache2-498ea95018b369e62646a98c7d7d5413b56e170c.tar.gz
Upstream tarball 2.2.17upstream/2.2.17
Diffstat (limited to 'srclib/apr-util/dbd/apr_dbd_odbc.c')
-rw-r--r--srclib/apr-util/dbd/apr_dbd_odbc.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/srclib/apr-util/dbd/apr_dbd_odbc.c b/srclib/apr-util/dbd/apr_dbd_odbc.c
index 3714a5df..b66dcf83 100644
--- a/srclib/apr-util/dbd/apr_dbd_odbc.c
+++ b/srclib/apr-util/dbd/apr_dbd_odbc.c
@@ -1139,7 +1139,7 @@ static int odbc_start_transaction(apr_pool_t *pool, apr_dbd_t *handle,
}
handle->can_commit = APR_DBD_TRANSACTION_COMMIT;
return APR_FROM_SQL_RESULT(rc);
-};
+}
/** end_transaction: end a transaction **/
@@ -1324,7 +1324,7 @@ static apr_status_t odbc_datum_get(const apr_dbd_row_t * row, int col,
return APR_ENOENT; /* SQL NULL value */
if (len < 0)
- strcpy(data, p);
+ *(char**)data = (char *)p;
else
memcpy(data, p, len);
@@ -1452,9 +1452,9 @@ static int odbc_pvquery(apr_pool_t * pool, apr_dbd_t * handle, int *nrows,
}
/** pselect: select using a prepared statement + args **/
-int odbc_pselect(apr_pool_t * pool, apr_dbd_t * handle,
- apr_dbd_results_t ** res, apr_dbd_prepared_t * statement,
- int random, const char **args)
+static int odbc_pselect(apr_pool_t * pool, apr_dbd_t * handle,
+ apr_dbd_results_t ** res, apr_dbd_prepared_t * statement,
+ int random, const char **args)
{
SQLRETURN rc = SQL_SUCCESS;
int i, argp;