Connector/ODBC 5 commit: r831 - in trunk: Driver/Setup/Library SDK/C/Library SDK/C/include SDK/MYSQLPlus/Library

[ahristov]

Modified:
   trunk/Driver/Setup/Library/ConfigDSNW.cpp
   trunk/SDK/C/Library/MYODBCC.cpp
   trunk/SDK/C/include/MYODBCC.h
   trunk/SDK/MYSQLPlus/Library/MResult_data_toC.cpp
Log:
num_pack and num_unpack (unused so far!) to MYODBCCString


Modified: trunk/Driver/Setup/Library/ConfigDSNW.cpp
===================================================================
--- trunk/Driver/Setup/Library/ConfigDSNW.cpp	2007-04-03 09:29:16 UTC (rev 830)
+++ trunk/Driver/Setup/Library/ConfigDSNW.cpp	2007-04-03 09:44:06 UTC (rev 831)
@@ -74,7 +74,7 @@
     QHash<QString,QString> hashKeywordValues;
     if (!MYODBCIns::getKeywordValues(&hashKeywordValues,
                                     
MYODBCCString::QString_fromWCharArray(pszzAttributes,
-                                                                       
MYODBCC::getKeywordValuesLength( pszzAttributes ) + 2),
+                                                                          
MYODBCC::getKeywordValuesLength(pszzAttributes) + 2),
                                      MYODBCIns::DELIM_NULL))
     {
         MYODBCIns::setError( "Data Source string seems invalid.",
ODBC_ERROR_INVALID_KEYWORD_VALUE );

Modified: trunk/SDK/C/Library/MYODBCC.cpp
===================================================================
--- trunk/SDK/C/Library/MYODBCC.cpp	2007-04-03 09:29:16 UTC (rev 830)
+++ trunk/SDK/C/Library/MYODBCC.cpp	2007-04-03 09:44:06 UTC (rev 831)
@@ -2774,7 +2774,7 @@
     return str;
 }
 
-void MYODBCC::num_pack( SQLCHAR *str, int val )
+void MYODBCCString::num_pack( SQLCHAR *str, int val )
 {
     int i;
     unsigned char a,b;
@@ -2788,7 +2788,7 @@
     }
 }
 
-int MYODBCC::num_unpack( const char *str )
+int MYODBCCString::num_unpack( const char *str )
 {
     int i, off = 1, final = 0;
     unsigned char x, lsd, msd;

Modified: trunk/SDK/C/include/MYODBCC.h
===================================================================
--- trunk/SDK/C/include/MYODBCC.h	2007-04-03 09:29:16 UTC (rev 830)
+++ trunk/SDK/C/include/MYODBCC.h	2007-04-03 09:44:06 UTC (rev 831)
@@ -476,6 +476,25 @@
                                     SQLWCHAR *pszSrc, SQLINTEGER *pnSrcLenCharsPtr = NULL
);
     static BOOL    doStringCopyOut( SQLWCHAR *pszDest, SQLINTEGER nDestMaxChars,
                                     QString src, SQLINTEGER *pnSrcLenCharsPtr = NULL );
+
+    /*!
+        \brief  Pack an 'int' into a char buffer.
+
+        To support SQL_NUMERIC_STRUCT.
+
+        \param  str 16 byte buffer to place packed int.
+        \param  val int to pack
+    */
+    static void num_pack( SQLCHAR *str, int val );
+
+    /*!
+        \brief  Unpack a int from a char buffer.
+
+        To support SQL_NUMERIC_STRUCT.
+
+        \param  str 16 byte buffer holding packed int
+    */
+    static int num_unpack( const char *str );
 };
 
 
@@ -544,27 +563,7 @@
 
     static BOOL    isQuoteNeededSQL( SQLSMALLINT nType );
 
-
     /*!
-        \brief  Pack an 'int' into a char buffer.
-
-        To support SQL_NUMERIC_STRUCT.
-
-        \param  str 16 byte buffer to place packed int.
-        \param  val int to pack
-    */
-    static void num_pack( SQLCHAR *str, int val );
-
-    /*!
-        \brief  Unpack a int from a char buffer.
-
-        To support SQL_NUMERIC_STRUCT.
-
-        \param  str 16 byte buffer holding packed int
-    */
-    static int num_unpack( const char *str );
-
-    /*!
         \name   Method argument/attribute value validators.
 
         These are used to validate that a value is valid - where the value is restricted
to a 

Modified: trunk/SDK/MYSQLPlus/Library/MResult_data_toC.cpp
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MResult_data_toC.cpp	2007-04-03 09:29:16 UTC (rev 830)
+++ trunk/SDK/MYSQLPlus/Library/MResult_data_toC.cpp	2007-04-03 09:44:06 UTC (rev 831)
@@ -496,7 +496,7 @@
                 MYODBCDbgInfo( QString( "nValueToPack       =%1" ).arg( nValueToPack ) );
 #endif
 
-                MYODBCC::num_pack( pNumericTarget->val, (int)nValueToPack );
+                MYODBCCString::num_pack( pNumericTarget->val, (int)nValueToPack );
 
                 if ( bFractionalTruncation )
                     MYODBCDbgReturn( getDiagnostic()->doAppend(
MDiagnostic::STATE_01S07 ) );