Connector/ODBC 5 commit: r864 - trunk/Driver/Driver/Library

[ahristov]

Modified:
   trunk/Driver/Driver/Library/MYODBCDriverInternal.h
   trunk/Driver/Driver/Library/SQLAllocHandle.cpp
   trunk/Driver/Driver/Library/SQLEndTran.cpp
   trunk/Driver/Driver/Library/SQLFreeHandle.cpp
   trunk/Driver/Driver/Library/SQLFreeStmt.cpp
   trunk/Driver/Driver/Library/SQLGetDescFieldW.cpp
   trunk/Driver/Driver/Library/SQLGetDiagFieldW.cpp
   trunk/Driver/Driver/Library/SQLGetDiagRecW.cpp
   trunk/Driver/Driver/Library/SQLGetFunctions.cpp
Log:
Make debug output code simpler from the automatically converted form.


Modified: trunk/Driver/Driver/Library/MYODBCDriverInternal.h
===================================================================
--- trunk/Driver/Driver/Library/MYODBCDriverInternal.h	2007-04-11 23:32:04 UTC (rev 863)
+++ trunk/Driver/Driver/Library/MYODBCDriverInternal.h	2007-04-12 12:01:10 UTC (rev 864)
@@ -36,8 +36,7 @@
 
 #include "../include/MYODBCDriver.h"
 
-#include <my_global.h>
-#include <my_dbug.h>
+#include <myodbc_dbug.h>
 
 #endif
 

Modified: trunk/Driver/Driver/Library/SQLAllocHandle.cpp
===================================================================
--- trunk/Driver/Driver/Library/SQLAllocHandle.cpp	2007-04-11 23:32:04 UTC (rev 863)
+++ trunk/Driver/Driver/Library/SQLAllocHandle.cpp	2007-04-12 12:01:10 UTC (rev 864)
@@ -80,18 +80,10 @@
     DBUG_ENTER("SQLAllocHandle");
 
 #if MYODBC_DBG > 1
-    {
-        QString tmp_msg = ( QString( "nHandleType=%1=%2" ).arg( nHandleType ).arg(
MYODBCCMap::getHandleTypeString( nHandleType ) ) );
-        DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
-    }
-    {
-        QString tmp_msg = ( QString( "hInputHandle=%1" ).arg( (qulonglong)hInputHandle )
);
-        DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
-    }
-    {
-        QString tmp_msg = ( QString( "phOutputHandle=%1" ).arg(
(qulonglong)phOutputHandle ) );
-        DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
-    }
+    DBUG_PRINT("oenter", ("nHandleType="SQLSINT_FORMAT, nHandleType));
+    DBUG_PRINT("oenter", ("nHandleType=%s", (const char
*)(MYODBCCMap::getHandleTypeString(nHandleType).toUtf8())));
+    DBUG_PRINT("oenter", ("hInputHandle=%p", hInputHandle));
+    DBUG_PRINT("oenter", ("phOutputHandle=%p", phOutputHandle));
 #endif
 
 #if MYODBC_DEV > 0
@@ -156,10 +148,7 @@
     }
 
 #if MYODBC_DBG > 1
-    {
-        QString tmp_msg = ( QString( "*phOutputHandle=%1" ).arg(
(qulonglong)*phOutputHandle ) );
-        DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
-    }
+    DBUG_PRINT("oinfo", ("phOutputHandle=%p", phOutputHandle));
 #endif
 
     DBUG_RETURN( nReturn );

Modified: trunk/Driver/Driver/Library/SQLEndTran.cpp
===================================================================
--- trunk/Driver/Driver/Library/SQLEndTran.cpp	2007-04-11 23:32:04 UTC (rev 863)
+++ trunk/Driver/Driver/Library/SQLEndTran.cpp	2007-04-12 12:01:10 UTC (rev 864)
@@ -57,14 +57,9 @@
     DBUG_ENTER("SQLEndTran");
 
 #if MYODBC_DBG > 1
-    {
-        QString tmp_msg = ( QString( "nHandleType=%1=%2" ).arg( nHandleType ).arg(
MYODBCCMap::getHandleTypeString( nHandleType ) ) );
-        DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
-    }
-    {
-        QString tmp_msg = ( QString( "hHandle=%1" ).arg( (qulonglong)hHandle ) );
-        DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
-    }
+    DBUG_PRINT("oenter", ("nHandleType="SQLSINT_FORMAT, nHandleType));
+    DBUG_PRINT("oenter", ("nHandleType=%s", (const char
*)(MYODBCCMap::getHandleTypeString(nHandleType).toUtf8())));
+    DBUG_PRINT("oenter", ("hHandle=%p", hHandle));
 #endif
 
 #if MYODBC_DEV > 0
@@ -82,6 +77,3 @@
 
     DBUG_RETURN( SQL_INVALID_HANDLE );
 }
-
-
-

Modified: trunk/Driver/Driver/Library/SQLFreeHandle.cpp
===================================================================
--- trunk/Driver/Driver/Library/SQLFreeHandle.cpp	2007-04-11 23:32:04 UTC (rev 863)
+++ trunk/Driver/Driver/Library/SQLFreeHandle.cpp	2007-04-12 12:01:10 UTC (rev 864)
@@ -52,19 +52,14 @@
     DBUG_ENTER("SQLFreeHandle");
 
 #if MYODBC_DBG > 1
-    {
-        QString tmp_msg = ( QString( "nHandleType=%1=%2" ).arg( (qulonglong)nHandleType
).arg( MYODBCCMap::getHandleTypeString( nHandleType ) ) );
-        DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
-    }
-    {
-        QString tmp_msg = ( QString( "hHandle=%1" ).arg( (qulonglong)hHandle ) );
-        DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
-    }
+    DBUG_PRINT("oenter", ("nHandleType="SQLSINT_FORMAT, nHandleType));
+    DBUG_PRINT("oenter", ("nHandleType=%s", (const char
*)(MYODBCCMap::getHandleTypeString(nHandleType).toUtf8())));
+    DBUG_PRINT("oenter", ("hHandle=%p", hHandle));
 #endif
 
 #if MYODBC_DEV > 0
     if ( !hHandle )
-        DBUG_RETURN( SQL_INVALID_HANDLE );
+        DBUG_RETURN(SQL_INVALID_HANDLE);
 #endif
 
     switch ( nHandleType )
@@ -98,9 +93,8 @@
             break;
 
         default:
-            DBUG_RETURN( SQL_INVALID_HANDLE );
+            DBUG_RETURN(SQL_INVALID_HANDLE);
     }
 
-    DBUG_RETURN( SQL_SUCCESS );
+    DBUG_RETURN(SQL_SUCCESS);
 }
-

Modified: trunk/Driver/Driver/Library/SQLFreeStmt.cpp
===================================================================
--- trunk/Driver/Driver/Library/SQLFreeStmt.cpp	2007-04-11 23:32:04 UTC (rev 863)
+++ trunk/Driver/Driver/Library/SQLFreeStmt.cpp	2007-04-12 12:01:10 UTC (rev 864)
@@ -59,19 +59,13 @@
     DBUG_ENTER("SQLFreeStmt");
 
 #if MYODBC_DBG > 1
-    {
-        QString tmp_msg = ( QString( "hStm=%1" ).arg( (qulonglong)hStm ) );
-        DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
-    }
-    {
-        QString tmp_msg = ( QString( "nOption=%1=%2" ).arg( nOption ).arg(
MYODBCCMap::getFreeStmtOptionString( nOption ) ) );
-        DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
-    }
+    DBUG_PRINT("oenter", ("hStm=%p", hStm));
+    DBUG_PRINT("oinfo", ("nOption=%s", (const char
*)MYODBCCMap::getFreeStmtOptionString(nOption).toUtf8()));
 #endif
 
 #if MYODBC_DEV > 0
     if ( !hStm )
-        DBUG_RETURN( SQL_INVALID_HANDLE );
+        DBUG_RETURN(SQL_INVALID_HANDLE);
 #endif
 
     MStatement *pStatement = (MStatement*)hStm;
@@ -79,10 +73,8 @@
     if ( nOption == SQL_DROP )
     {
         delete pStatement;
-        DBUG_RETURN( SQL_SUCCESS );
+        DBUG_RETURN(SQL_SUCCESS);
     }
 
-    DBUG_RETURN( pStatement->doFreeStmt( nOption ) );
+    DBUG_RETURN(pStatement->doFreeStmt(nOption));
 }
-
-

Modified: trunk/Driver/Driver/Library/SQLGetDescFieldW.cpp
===================================================================
--- trunk/Driver/Driver/Library/SQLGetDescFieldW.cpp	2007-04-11 23:32:04 UTC (rev 863)
+++ trunk/Driver/Driver/Library/SQLGetDescFieldW.cpp	2007-04-12 12:01:10 UTC (rev 864)
@@ -39,17 +39,15 @@
     DBUG_ENTER("SQLGetDescFieldW");
 
 #if MYODBC_DBG > 1
-    {
-        QString tmp_msg = ( QString( "hDes=%1" ).arg( (qulonglong)hDes ) );
-        DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
-    }
+    DBUG_PRINT("oenter", ("hDes=%p", hDes));
+    DBUG_PRINT("oenter", ("nRecNumber="SQLSINT_FORMAT, nRecNumber));
+    DBUG_PRINT("oenter", ("nFieldIdentifier="SQLSINT_FORMAT, nFieldIdentifier));
 #endif
 
 #if MYODBC_DEV > 0
     if ( !hDes )
-        DBUG_RETURN( SQL_INVALID_HANDLE );
+        DBUG_RETURN(SQL_INVALID_HANDLE);
 #endif
 
     DBUG_RETURN( ((MDescriptor*)hDes)->getDescField( nRecNumber, nFieldIdentifier,
pValue, nBufferLength, pnStringLength ) );
 }
-

Modified: trunk/Driver/Driver/Library/SQLGetDiagFieldW.cpp
===================================================================
--- trunk/Driver/Driver/Library/SQLGetDiagFieldW.cpp	2007-04-11 23:32:04 UTC (rev 863)
+++ trunk/Driver/Driver/Library/SQLGetDiagFieldW.cpp	2007-04-12 12:01:10 UTC (rev 864)
@@ -43,19 +43,14 @@
     DBUG_ENTER("SQLGetDiagFieldW");
 
 #if MYODBC_DBG > 1
-    {
-        QString tmp_msg = ( QString( "nHandleType=%1=%2" ).arg( nHandleType ).arg(
MYODBCCMap::getHandleTypeString( nHandleType ) ) );
-        DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
-    }
-    {
-        QString tmp_msg = ( QString( "hHandle=%1" ).arg( (qulonglong)hHandle ) );
-        DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
-    }
+    DBUG_PRINT("oenter", ("nHandleType="SQLSINT_FORMAT, nHandleType));
+    DBUG_PRINT("oenter", ("nHandleType=%s", (const char
*)(MYODBCCMap::getHandleTypeString(nHandleType).toUtf8())));
+    DBUG_PRINT("oenter", ("hHandle=%p", hHandle));
 #endif
 
 #if MYODBC_DEV > 0
     if ( !hHandle )
-        DBUG_RETURN( SQL_INVALID_HANDLE );
+        DBUG_RETURN(SQL_INVALID_HANDLE);
 #endif
 
     switch ( nHandleType )
@@ -70,6 +65,5 @@
             DBUG_RETURN( ((MDescriptor*)hHandle)->getDiagField( nRecNumber,
nDiagIdentifier, pDiagInfo, nBufferLength, pnStringLength ) );
     }
 
-    DBUG_RETURN( SQL_INVALID_HANDLE );
+    DBUG_RETURN(SQL_INVALID_HANDLE);
 }
-

Modified: trunk/Driver/Driver/Library/SQLGetDiagRecW.cpp
===================================================================
--- trunk/Driver/Driver/Library/SQLGetDiagRecW.cpp	2007-04-11 23:32:04 UTC (rev 863)
+++ trunk/Driver/Driver/Library/SQLGetDiagRecW.cpp	2007-04-12 12:01:10 UTC (rev 864)
@@ -41,19 +41,15 @@
     DBUG_ENTER("SQLGetDiagRecW");
 
 #if MYODBC_DBG > 1
-    {
-        QString tmp_msg = ( QString( "nHandleType=%1=%2" ).arg( nHandleType ).arg(
MYODBCCMap::getHandleTypeString( nHandleType ) ) );
-        DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
-    }
-    {
-        QString tmp_msg = ( QString( "hHandle=%1" ).arg( (qulonglong)hHandle ) );
-        DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
-    }
+    DBUG_PRINT("oenter", ("nHandleType="SQLSINT_FORMAT, nHandleType));
+    DBUG_PRINT("oenter", ("nHandleType=%s", (const char
*)(MYODBCCMap::getHandleTypeString(nHandleType).toUtf8())));
+    DBUG_PRINT("oenter", ("hHandle=%p", hHandle));
+    DBUG_PRINT("oenter", ("nRecNumber="SQLSINT_FORMAT, nRecNumber));
 #endif
 
 #if MYODBC_DEV > 0
     if ( !hHandle )
-        DBUG_RETURN( SQL_INVALID_HANDLE );
+        DBUG_RETURN(SQL_INVALID_HANDLE);
 #endif
 
     switch ( nHandleType )
@@ -69,6 +65,6 @@
             DBUG_RETURN( ((MDescriptor*)hHandle)->getDiagRec( nRecNumber, psSQLState,
pnNativeError, psMessageText, nBufferLength, pnTextLength ) );
     }
 
-    DBUG_RETURN( SQL_INVALID_HANDLE );
+    DBUG_RETURN(SQL_INVALID_HANDLE);
 }
 

Modified: trunk/Driver/Driver/Library/SQLGetFunctions.cpp
===================================================================
--- trunk/Driver/Driver/Library/SQLGetFunctions.cpp	2007-04-11 23:32:04 UTC (rev 863)
+++ trunk/Driver/Driver/Library/SQLGetFunctions.cpp	2007-04-12 12:01:10 UTC (rev 864)
@@ -169,19 +169,13 @@
     DBUG_ENTER("SQLGetFunctions");
 
 #if MYODBC_DBG > 1
-    {
-        QString tmp_msg = ( QString( "hDbc=%1" ).arg( (qulonglong)hDbc ) );
-        DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
-    }
-    {
-        QString tmp_msg = ( QString("nFunctionID=%1=%2").arg( nFunctionID ).arg(
MYODBCCMap::getFunctionsString( nFunctionID ) ) );
-        DBUG_PRINT("oinfo", ("%s", (const char *)(tmp_msg.toUtf8())));
-    }
+    DBUG_PRINT("oenter", ("hDbc=%p", hDbc));
+    DBUG_PRINT("oenter", ("nFunctionID=%s", (const char *)
MYODBCCMap::getFunctionsString(nFunctionID).toUtf8()));
 #endif
 
 #if MYODBC_DEV > 0
     if ( !hDbc )
-        DBUG_RETURN( SQL_INVALID_HANDLE );
+        DBUG_RETURN(SQL_INVALID_HANDLE);
 #endif
 
     MConnection *   pConnection = (MConnection*)hDbc;
@@ -257,5 +251,3 @@
 
     DBUG_RETURN( SQL_SUCCESS );
 }
-
-