Connector/ODBC 3.51 commit: r701 - in branches/guffert: . driver

[jwinstead]

Modified:
   branches/guffert/ChangeLog
   branches/guffert/driver/ansi.c
   branches/guffert/driver/unicode.c
Log:
Fix error functions to handle getting error on an unconnected HDBC.


Modified: branches/guffert/ChangeLog
===================================================================
--- branches/guffert/ChangeLog	2007-08-27 17:32:50 UTC (rev 700)
+++ branches/guffert/ChangeLog	2007-08-27 20:35:07 UTC (rev 701)
@@ -21,6 +21,8 @@
     http://msdn2.microsoft.com/en-us/library/ms712446.aspx
   * Implement SQLCancel() (Bug #15601):
     http://msdn2.microsoft.com/en-us/library/ms714112.aspx
+  * Implement arays of parameters:
+    http://msdn2.microsoft.com/en-us/library/ms711818.aspx
 
 ----
 

Modified: branches/guffert/driver/ansi.c
===================================================================
--- branches/guffert/driver/ansi.c	2007-08-27 17:32:50 UTC (rev 700)
+++ branches/guffert/driver/ansi.c	2007-08-27 20:35:07 UTC (rev 701)
@@ -649,7 +649,8 @@
   {
     SQLINTEGER free_value= FALSE;
     uint errors;
-    if (dbc && dbc->ansi_charset_info->number !=
dbc->cxn_charset_info->number)
+    if (dbc && dbc->ansi_charset_info &&
+        dbc->ansi_charset_info->number != dbc->cxn_charset_info->number)
     {
       value= sqlchar_as_sqlchar(dbc->cxn_charset_info,
                                     dbc->ansi_charset_info,
@@ -723,7 +724,8 @@
 
   if (msg_value)
   {
-    if (dbc && dbc->ansi_charset_info->number !=
dbc->cxn_charset_info->number)
+    if (dbc && dbc->ansi_charset_info &&
+        dbc->ansi_charset_info->number != dbc->cxn_charset_info->number)
     {
       msg_value= sqlchar_as_sqlchar(dbc->cxn_charset_info,
                                     dbc->ansi_charset_info,
@@ -751,7 +753,8 @@
 
   if (sqlstate && sqlstate_value)
   {
-    if (dbc && dbc->ansi_charset_info->number !=
dbc->cxn_charset_info->number)
+    if (dbc && dbc->ansi_charset_info &&
+        dbc->ansi_charset_info->number != dbc->cxn_charset_info->number)
     {
       sqlstate_value= sqlchar_as_sqlchar(dbc->cxn_charset_info,
                                          dbc->ansi_charset_info,

Modified: branches/guffert/driver/unicode.c
===================================================================
--- branches/guffert/driver/unicode.c	2007-08-27 17:32:50 UTC (rev 700)
+++ branches/guffert/driver/unicode.c	2007-08-27 20:35:07 UTC (rev 701)
@@ -796,7 +796,8 @@
   if (value)
   {
     uint errors;
-    SQLWCHAR *wvalue= sqlchar_as_sqlwchar(dbc ? dbc->cxn_charset_info :
+    SQLWCHAR *wvalue= sqlchar_as_sqlwchar((dbc && dbc->cxn_charset_info) ?
+                                          dbc->cxn_charset_info :
                                           default_charset_info,
                                           value, &len, &errors);
 
@@ -864,7 +865,8 @@
 
   if (msg_value)
   {
-    SQLWCHAR *wvalue= sqlchar_as_sqlwchar(dbc ? dbc->cxn_charset_info :
+    SQLWCHAR *wvalue= sqlchar_as_sqlwchar((dbc && dbc->cxn_charset_info) ?
+                                          dbc->cxn_charset_info :
                                           default_charset_info,
                                           msg_value, &len, &errors);
 
@@ -887,7 +889,8 @@
 
   if (sqlstate && sqlstate_value)
   {
-    SQLWCHAR *wvalue= sqlchar_as_sqlwchar(dbc ? dbc->cxn_charset_info :
+    SQLWCHAR *wvalue= sqlchar_as_sqlwchar((dbc && dbc->cxn_charset_info) ?
+                                          dbc->cxn_charset_info :
                                           default_charset_info,
                                           sqlstate_value, &len, &errors);