diff options
author | bojan <bojan@13f79535-47bb-0310-9956-ffa450edef68> | 2007-11-12 07:34:45 +0000 |
---|---|---|
committer | bojan <bojan@13f79535-47bb-0310-9956-ffa450edef68> | 2007-11-12 07:34:45 +0000 |
commit | b82d5d9041611e474358f5105fb625bbbeefa645 (patch) | |
tree | fde776ed21a9a8e12f6f35d0b2c7c10c817c6c5b /dbd | |
parent | d9fec0d827f0deeb2b9165a1d27628c8d87cff14 (diff) | |
download | libapr-util-b82d5d9041611e474358f5105fb625bbbeefa645.tar.gz |
Make sure macro int_errorcode is last declaration
Original patch by Tom Donovan
PR 43827
git-svn-id: http://svn.apache.org/repos/asf/apr/apr-util/trunk@594036 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'dbd')
-rw-r--r-- | dbd/apr_dbd_oracle.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/dbd/apr_dbd_oracle.c b/dbd/apr_dbd_oracle.c index e8171f1a..b4d1678a 100644 --- a/dbd/apr_dbd_oracle.c +++ b/dbd/apr_dbd_oracle.c @@ -1106,11 +1106,12 @@ static int outputParams(apr_dbd_t *sql, apr_dbd_prepared_t *stmt) { OCIParam *parms; int i; - int_errorcode; ub2 paramtype[DBD_ORACLE_MAX_COLUMNS]; ub2 paramsize[DBD_ORACLE_MAX_COLUMNS]; const char *paramname[DBD_ORACLE_MAX_COLUMNS]; ub4 paramnamelen[DBD_ORACLE_MAX_COLUMNS]; + int_errorcode; + /* Perl uses 0 where we used 1 */ sql->status = OCIStmtExecute(sql->svc, stmt->stmt, sql->err, 0, 0, NULL, NULL, OCI_DESCRIBE_ONLY); @@ -1254,11 +1255,11 @@ static int dbd_oracle_pquery(apr_pool_t *pool, apr_dbd_t *sql, int *nrows, apr_dbd_prepared_t *statement, const char **values) { - int_errorcode; OCISnapshot *oldsnapshot = NULL; OCISnapshot *newsnapshot = NULL; apr_dbd_transaction_t* trans = sql->trans; int exec_mode; + int_errorcode; if (trans) { switch (trans->status) { @@ -1339,6 +1340,7 @@ static int dbd_oracle_pselect(apr_pool_t *pool, apr_dbd_t *sql, OCISnapshot *oldsnapshot = NULL; OCISnapshot *newsnapshot = NULL; apr_dbd_transaction_t* trans = sql->trans; + int_errorcode; if (trans) { switch (trans->status) { @@ -1365,7 +1367,6 @@ static int dbd_oracle_pselect(apr_pool_t *pool, apr_dbd_t *sql, sql->status = OCIStmtExecute(sql->svc, statement->stmt, sql->err, 0, 0, oldsnapshot, newsnapshot, exec_mode); switch (sql->status) { - int_errorcode; case OCI_SUCCESS: break; case OCI_ERROR: @@ -1641,11 +1642,11 @@ static int dbd_oracle_pbquery(apr_pool_t * pool, apr_dbd_t * sql, int *nrows, apr_dbd_prepared_t * statement, const void **values) { - int_errorcode; OCISnapshot *oldsnapshot = NULL; OCISnapshot *newsnapshot = NULL; apr_dbd_transaction_t* trans = sql->trans; int exec_mode; + int_errorcode; if (trans) { switch (trans->status) { @@ -1726,6 +1727,7 @@ static int dbd_oracle_pbselect(apr_pool_t * pool, apr_dbd_t * sql, OCISnapshot *oldsnapshot = NULL; OCISnapshot *newsnapshot = NULL; apr_dbd_transaction_t* trans = sql->trans; + int_errorcode; if (trans) { switch (trans->status) { @@ -1752,7 +1754,6 @@ static int dbd_oracle_pbselect(apr_pool_t * pool, apr_dbd_t * sql, sql->status = OCIStmtExecute(sql->svc, statement->stmt, sql->err, 0, 0, oldsnapshot, newsnapshot, exec_mode); switch (sql->status) { - int_errorcode; case OCI_SUCCESS: break; case OCI_ERROR: @@ -1923,7 +1924,6 @@ static int dbd_oracle_transaction_mode_set(apr_dbd_transaction_t *trans, */ static const char *dbd_oracle_get_entry(const apr_dbd_row_t *row, int n) { - int_errorcode; ub4 len = 0; ub1 csform = 0; ub2 csid = 0; @@ -1931,6 +1931,7 @@ static const char *dbd_oracle_get_entry(const apr_dbd_row_t *row, int n) char *buf = NULL; define_arg *val = &row->res->statement->out[n]; apr_dbd_t *sql = row->res->handle; + int_errorcode; if ((n < 0) || (n >= row->res->statement->nout) || (val->ind == -1)) { return NULL; |