[Carob-commits] CVS update of carob/src (Connection.cpp)

[marc]

    Date: Tuesday, November 15, 2005 @ 17:25:59
  Author: marc
    Path: /cvsroot/carob/carob/src

Modified: Connection.cpp (1.20 -> 1.21)

Renamed 'ack' to 'authenticated'. Couple formatting fixes.


----------------+
 Connection.cpp |   25 ++++++++++++++++---------
 1 files changed, 16 insertions(+), 9 deletions(-)


Index: carob/src/Connection.cpp
diff -u carob/src/Connection.cpp:1.20 carob/src/Connection.cpp:1.21
--- carob/src/Connection.cpp:1.20       Tue Nov 15 17:20:28 2005
+++ carob/src/Connection.cpp    Tue Nov 15 17:25:59 2005
@@ -158,14 +158,14 @@
     UnexpectedException)
 {
   wstring fctName(L"Connection::finalizeConnect");
-  bool ack = false;
-  bool  ackRead = false,
+  bool authenticated = false;
+  bool  authenticatedRead = false,
         needsSkelRead = false;
   try
   {
-    *driverSocketPtr>>ack;
-    ackRead = true;
-    if (!ack)
+    *driverSocketPtr>>authenticated;
+    authenticatedRead = true;
+    if (!authenticated)
     {
       wstring reason;
       *driverSocketPtr>>reason;
@@ -182,8 +182,8 @@
   catch (SocketIOException sockIOExcpt)
   {
     wstring msg(fctName + L" Authentication failed. Error ");
-    if (!ackRead)
-      msg += L"while reading controller ack";
+    if (!authenticatedRead)
+      msg += L"while reading controller authenticated";
     else if (!needsSkelRead)
       msg += L"while reading need of sql skeleton";
     else
@@ -508,11 +508,11 @@
     {
       case TT_RESULTSET:
         retVal = new DriverResultSet(this);
-      break;
+        break;
       //case TT_NULL_RESULTSET: nothing to do, just return NULL
       case TT_EXCEPTION:
         receiveException();
-      break;
+        break;
     }
   }
   catch (SocketIOException sioe)
@@ -649,4 +649,11 @@
 }
 
 
+/*
+ * Local Variables:
+ * c-file-style: "bsd"
+ * c-basic-offset: 2
+ * indent-tabs-mode: nil
+ * End:
+ */
 

_______________________________________________
Carob-commits mailing list
Carob-commits@lists.forge.continuent.org
https://forge.continuent.org/mailman/listinfo/carob-commits