From a262bf3d1102a413d2c8161e469ab6f3df8baf96 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Wed, 30 Nov 2011 12:13:33 +0200
Subject: Cosmetic changes
---
odb/oracle/error.cxx | 62 ++++++++++++++++++++++++++++------------------------
odb/oracle/error.hxx | 6 ++---
2 files changed, 37 insertions(+), 31 deletions(-)
diff --git a/odb/oracle/error.cxx b/odb/oracle/error.cxx
index b822256..f52de31 100644
--- a/odb/oracle/error.cxx
+++ b/odb/oracle/error.cxx
@@ -20,38 +20,38 @@ namespace odb
namespace oracle
{
static void
- translate_error (void* h, ub4 t, sword s, connection* conn)
+ translate_error (void* h, ub4 htype, sword r, connection* conn)
{
- assert (s != OCI_SUCCESS && s != OCI_SUCCESS_WITH_INFO);
+ assert (r != OCI_SUCCESS && r != OCI_SUCCESS_WITH_INFO);
- if (s != OCI_ERROR)
+ switch (r)
{
- switch (s)
+ case OCI_STILL_EXECUTING:
{
- case OCI_STILL_EXECUTING:
- {
- throw database_exception (0, "statement still executing");
- break;
- }
- case OCI_NEED_DATA:
- case OCI_NO_DATA:
- {
- throw database_exception (0, "unhandled OCI_*_DATA condition");
- break;
- }
- case OCI_INVALID_HANDLE:
- {
- throw invalid_oci_handle ();
- break;
+ throw database_exception (0, "statement still executing");
+ break;
}
+ case OCI_NEED_DATA:
+ case OCI_NO_DATA:
+ {
+ throw database_exception (0, "unhandled OCI_*_DATA condition");
+ break;
+ }
+ case OCI_INVALID_HANDLE:
+ {
+ throw invalid_oci_handle ();
+ break;
+ }
+ default:
+ {
+ break;
}
}
- sword r;
sb4 e;
char b[512]; // Error message will be truncated if it does not fit.
- if (t == OCI_HTYPE_ERROR)
+ if (htype == OCI_HTYPE_ERROR)
{
// Mark the connection as failed if necessary.
//
@@ -104,7 +104,13 @@ namespace odb
for (sb4 i (1);; ++i)
{
- r = OCIErrorGet (h, i, 0, &e, reinterpret_cast<OraText*> (b), 512, t);
+ r = OCIErrorGet (h,
+ i,
+ 0,
+ &e,
+ reinterpret_cast<OraText*> (b),
+ 512,
+ htype);
if (r == OCI_NO_DATA)
break;
@@ -116,7 +122,7 @@ namespace odb
nc = code_deadlock;
else if (e == 51 || // Timeout occurred while waiting for a resource.
e == 54 || // Resource busy and acquisition timeout expired.
- e == 2049) // Distributed lock timeout.
+ e == 2049) // Distributed lock timeout.
nc = code_timeout;
else if (e == 28 || // Session has been killed.
e == 3113 || // End-of-file on communication channel.
@@ -166,7 +172,7 @@ namespace odb
&e,
reinterpret_cast<OraText*> (b),
512,
- t);
+ htype);
if (r == OCI_NO_DATA)
break;
@@ -178,15 +184,15 @@ namespace odb
}
void
- translate_error (OCIError* h, sword result)
+ translate_error (OCIError* h, sword r)
{
- translate_error (h, OCI_HTYPE_ERROR, result, 0);
+ translate_error (h, OCI_HTYPE_ERROR, r, 0);
}
void
- translate_error (connection& c, sword result)
+ translate_error (connection& c, sword r)
{
- translate_error (c.error_handle (), OCI_HTYPE_ERROR, result, &c);
+ translate_error (c.error_handle (), OCI_HTYPE_ERROR, r, &c);
}
void
diff --git a/odb/oracle/error.hxx b/odb/oracle/error.hxx
index a715bce..62639db 100644
--- a/odb/oracle/error.hxx
+++ b/odb/oracle/error.hxx
@@ -21,16 +21,16 @@ namespace odb
// exception.
//
LIBODB_ORACLE_EXPORT void
- translate_error (OCIError* h, sword result);
+ translate_error (OCIError*, sword result);
LIBODB_ORACLE_EXPORT void
- translate_error (connection& c, sword result);
+ translate_error (connection&, sword result);
// Translate an OCI error given an environment handle error and throw
// an appropriate exception.
//
LIBODB_ORACLE_EXPORT void
- translate_error (OCIEnv* h);
+ translate_error (OCIEnv*);
}
}
--
cgit v1.1