Connector/ODBC 5 commit: r839 - in trunk/SDK: Dbg/Tests MYSQLPlus/Library

[ahristov]

Modified:
   trunk/SDK/Dbg/Tests/MYODBCDbgTest.cpp
   trunk/SDK/MYSQLPlus/Library/MDiagnostic.cpp
   trunk/SDK/MYSQLPlus/Library/MResult_data_toC.cpp
   trunk/SDK/MYSQLPlus/Library/MStatement.cpp
Log:
Put everything on one line, to easy the parsing process.


Modified: trunk/SDK/Dbg/Tests/MYODBCDbgTest.cpp
===================================================================
--- trunk/SDK/Dbg/Tests/MYODBCDbgTest.cpp	2007-04-04 04:39:56 UTC (rev 838)
+++ trunk/SDK/Dbg/Tests/MYODBCDbgTest.cpp	2007-04-04 08:02:54 UTC (rev 839)
@@ -82,7 +82,7 @@
 
     MYODBCDbgInfo( "" );
     MYODBCDbgInfo( QString( "Got here %1" ).arg( __FILE__ ) );
-    MYODBCDbgInfo( QString( "gpMYODBCDbg = %1" ).arg( n ) )
+    MYODBCDbgInfo( QString( "gpMYODBCDbg = %1" ).arg( n ) );
 
     MYODBCDbgReturn( SQL_SUCCESS );
 }

Modified: trunk/SDK/MYSQLPlus/Library/MDiagnostic.cpp
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MDiagnostic.cpp	2007-04-04 04:39:56 UTC (rev 838)
+++ trunk/SDK/MYSQLPlus/Library/MDiagnostic.cpp	2007-04-04 08:02:54 UTC (rev 839)
@@ -698,10 +698,7 @@
     MYODBCDbgEnter();
 
 #if MYODBC_DBG > 1
-    MYODBCDbgInfo( QString( "nState=%1=%2=%3 Custom Message=%4" ).arg( nState )
-                                               .arg(
pStates[stateMap[nState]].stringSQLState )
-                                               .arg( pStates[stateMap[nState]].stringText
)
-                                               .arg( stringMessage ) );
+    MYODBCDbgInfo( QString( "nState=%1=%2=%3 Custom Message=%4" ).arg( nState ).arg(
pStates[stateMap[nState]].stringSQLState ).arg( pStates[stateMap[nState]].stringText
).arg( stringMessage ) );
 #endif
 
     /* sanity checks */

Modified: trunk/SDK/MYSQLPlus/Library/MResult_data_toC.cpp
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MResult_data_toC.cpp	2007-04-04 04:39:56 UTC (rev 838)
+++ trunk/SDK/MYSQLPlus/Library/MResult_data_toC.cpp	2007-04-04 08:02:54 UTC (rev 839)
@@ -136,10 +136,7 @@
         nTargetType != SQL_C_DEFAULT &&
         nTargetType != SQL_ARD_TYPE )
     {
-        MYODBCDbgReturn( getDiagnostic()->doAppend( MDiagnostic::STATE_HY003, 0,
-                    QString( "Invalid C-type=%1=%2" ).arg( nTargetType )
-                        .arg( MYODBCCMap::getConciseTypeStringC(
-                                nTargetType, getEnvironment()->getODBCVersion() ) ) )
);
+        MYODBCDbgReturn( getDiagnostic()->doAppend( MDiagnostic::STATE_HY003, 0,
QString( "Invalid C-type=%1=%2" ).arg( nTargetType ).arg(
MYODBCCMap::getConciseTypeStringC(nTargetType, getEnvironment()->getODBCVersion() ) )
) );
     }
 
     MYODBCDbgReturn( getData( getRowSetRowIndex(), nColumn, nTargetType, pTarget,
nBufferLength, pnLength, pnIndicator ) );
@@ -177,10 +174,8 @@
         (MDescriptorRecordIRD*)getImpRowDesc()->getRecord( nColumn );
 
 #if MYODBC_DBG > 1
-    MYODBCDbgInfo( QString( "adjusted nTargetType=%1" )
-            .arg( nTargetType ) );
-    MYODBCDbgInfo( QString( "initial nTargetType=%1" )
-            .arg( nTargetType ) );
+    MYODBCDbgInfo( QString( "adjusted nTargetType=%1" ).arg( nTargetType ) );
+    MYODBCDbgInfo( QString( "initial nTargetType=%1" ).arg( nTargetType ) );
 #endif
 
     /* clear "GetData" state if we're on a new field */
@@ -260,8 +255,7 @@
     }
 
 #if MYODBC_DBG > 1
-    MYODBCDbgInfo( QString( "cell data (1st 50 chars)=%1" )
-            .arg( val.toString().left( 50 ) ) );
+    MYODBCDbgInfo( QString( "cell data (1st 50 chars)=%1" ).arg( val.toString().left( 50
) ) );
 #endif
 
     QVariant::Type destType = MDataConvert::qtypeForCType( nTargetType );

Modified: trunk/SDK/MYSQLPlus/Library/MStatement.cpp
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MStatement.cpp	2007-04-04 04:39:56 UTC (rev 838)
+++ trunk/SDK/MYSQLPlus/Library/MStatement.cpp	2007-04-04 08:02:54 UTC (rev 839)
@@ -321,8 +321,7 @@
 
 #if MYODBC_DBG > 1
     MYODBCDbgInfo( QString( "nColumnNumber=%1" ).arg( nColumnNumber ) );
-    MYODBCDbgInfo( QString( "nTargetType=%1=%2" ).arg( nTargetType ).
-                    arg( MYODBCCMap::getConciseTypeStringC( nTargetType,
getEnvironment()->getODBCVersion() ) ) );
+    MYODBCDbgInfo( QString( "nTargetType=%1=%2" ).arg( nTargetType ).arg(
MYODBCCMap::getConciseTypeStringC( nTargetType, getEnvironment()->getODBCVersion() ) )
);
     MYODBCDbgInfo( QString( "pTargetValue=%1" ).arg( (qulonglong)pTargetValue ) );
     MYODBCDbgInfo( QString( "nBufferLength=%1" ).arg( nBufferLength ) );
     MYODBCDbgInfo( QString( "pnStrLenOrInd=%1" ).arg( (qulonglong)pnStrLenOrInd ) );