From bf7704d65fb4addb0764e9d11fa7311719984bcc Mon Sep 17 00:00:00 2001 From: trawick Date: Wed, 23 Mar 2011 19:19:25 +0000 Subject: 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) git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@1084681 13f79535-47bb-0310-9956-ffa450edef68 --- dbd/apr_dbd_oracle.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'dbd') diff --git a/dbd/apr_dbd_oracle.c b/dbd/apr_dbd_oracle.c index 832677d90..a851e1f92 100644 --- a/dbd/apr_dbd_oracle.c +++ b/dbd/apr_dbd_oracle.c @@ -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 *pool, apr_dbd_t *sql, 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 *pool, apr_dbd_t *sql, 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 -- cgit v1.2.1