aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorConstantin Michael <constantin@codesynthesis.com>2011-10-14 13:39:04 +0200
committerConstantin Michael <constantin@codesynthesis.com>2011-10-14 13:39:04 +0200
commit5f66b4f0b1370c167e9aed2334e112d07f93f3b0 (patch)
tree6cfc1237309269b837519ca804bd485bb63db34e
parentc4c7df8d37d4614b525a8dfd4fda1f1d519c97bf (diff)
Adhere to OCI recommendations for unused arguments when binding callbacks
-rw-r--r--odb/oracle/statement.cxx13
1 files changed, 7 insertions, 6 deletions
diff --git a/odb/oracle/statement.cxx b/odb/oracle/statement.cxx
index 3de8619..0e7d387 100644
--- a/odb/oracle/statement.cxx
+++ b/odb/oracle/statement.cxx
@@ -169,21 +169,22 @@ namespace odb
assert (b->type != bind::integer || b->capacity <= 4);
#endif
+ bool callback (b->callback != 0);
OCIBind* h (0);
+
sword r (OCIBindByPos (stmt_,
&h,
err,
o,
- b->buffer,
+ callback ? 0 : b->buffer,
static_cast<sb4> (b->capacity),
param_sqlt_lookup[b->type],
- b->indicator,
- b->size,
+ callback ? 0 : b->indicator,
+ callback ? 0 : b->size,
0,
0,
0,
- b->callback.param != 0 ?
- OCI_DATA_AT_EXEC : OCI_DEFAULT));
+ callback ? OCI_DATA_AT_EXEC : OCI_DEFAULT));
if (r == OCI_ERROR || r == OCI_INVALID_HANDLE)
translate_error (err, r);
@@ -203,7 +204,7 @@ namespace odb
translate_error (err, r);
}
- if (b->callback.param != 0)
+ if (callback)
{
r = OCIBindDynamic (h, err, b, &param_callback_proxy, 0, 0);