You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by tr...@apache.org on 2011/03/23 20:19:25 UTC
svn commit: r1084681 - /apr/apr/trunk/dbd/apr_dbd_oracle.c
Author: trawick
Date: Wed Mar 23 19:19:25 2011
New Revision: 1084681
URL: http://svn.apache.org/viewvc?rev=1084681&view=rev
Log:
small simplification to the fix in r1065258: just use the Oracle
datatype for the type field
(http://download.oracle.com/docs/cd/B28359_01/appdev.111/b28395/ociaahan.htm#sthref5358)
Modified:
apr/apr/trunk/dbd/apr_dbd_oracle.c
Modified: apr/apr/trunk/dbd/apr_dbd_oracle.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/dbd/apr_dbd_oracle.c?rev=1084681&r1=1084680&r2=1084681&view=diff
==============================================================================
--- apr/apr/trunk/dbd/apr_dbd_oracle.c (original)
+++ apr/apr/trunk/dbd/apr_dbd_oracle.c Wed Mar 23 19:19:25 2011
@@ -178,7 +178,7 @@ struct apr_dbd_prepared_t {
define_arg *out;
apr_dbd_t *handle;
apr_pool_t *pool;
- int type;
+ ub2 type;
};
/* AFAICT from the docs, the OCIEnv thingey can be used async
@@ -860,7 +860,6 @@ static int dbd_oracle_prepare(apr_pool_t
int ret = 0;
int i;
apr_dbd_prepared_t *stmt ;
- apr_int16_t type;
if (*statement == NULL) {
*statement = apr_pcalloc(pool, sizeof(apr_dbd_prepared_t));
@@ -896,12 +895,11 @@ static int dbd_oracle_prepare(apr_pool_t
apr_pool_cleanup_null);
/* Perl gets statement type here */
- sql->status = OCIAttrGet(stmt->stmt, OCI_HTYPE_STMT, &type, 0,
+ sql->status = OCIAttrGet(stmt->stmt, OCI_HTYPE_STMT, &stmt->type, 0,
OCI_ATTR_STMT_TYPE, sql->err);
if (sql->status != OCI_SUCCESS) {
return 1;
}
- stmt->type = type;
/* Perl sets PREFETCH_MEMORY here, but the docs say there's a working default */
#if 0