- Fixing TAB to 2 spaces

- Fixing line endings from "\r\n" to "\n"

1 files changed, 185 insertions, 185 deletions

diff --git a/storage/connect/odbconn.h b/storage/connect/odbconn.h
index 7f1567eaa70..2bf18c049f7 100644
--- a/storage/connect/odbconn.h
+++ b/storage/connect/odbconn.h
@@ -1,185 +1,185 @@
-/***********************************************************************/

-/*  ODBConn.h : header file for the ODBC connection classes.           */

-/***********************************************************************/

-//nclude <windows.h>                           /* Windows include file */

-//nclude <windowsx.h>                          /* Message crackers     */

-

-/***********************************************************************/

-/*  Included C-definition files required by the interface.             */

-/***********************************************************************/

-#include "block.h"

-

-/***********************************************************************/

-/*  ODBC interface.                                                    */

-/***********************************************************************/

-#include <sql.h>

-#include <sqlext.h>

-

-/***********************************************************************/

-/*  Constants and defines.                                             */

-/***********************************************************************/

-//  Miscellaneous sizing info

-#define MAX_NUM_OF_MSG   10     // Max number of error messages

-//efine MAX_CURRENCY     30     // Max size of Currency($) string

-#define MAX_TNAME_LEN    32     // Max size of table names

-//efine MAX_FNAME_LEN    256    // Max size of field names

-#define MAX_STRING_INFO  256    // Max size of string from SQLGetInfo

-//efine MAX_DNAME_LEN    256    // Max size of Recordset names

-#define MAX_CONNECT_LEN  512    // Max size of Connect string

-//efine MAX_CURSOR_NAME  18     // Max size of a cursor name

-#define DEFAULT_FIELD_TYPE SQL_TYPE_NULL // pick "C" data type to match SQL data type

-

-#if !defined(WIN32)

-typedef unsigned char *PUCHAR;

-#endif   // !WIN32

-

-// Timeout and net wait defaults

-#define DEFAULT_LOGIN_TIMEOUT 15    // seconds to before fail on connect

-#define DEFAULT_QUERY_TIMEOUT 15    // seconds to before fail waiting for results

-

-// Field Flags, used to indicate status of fields

-//efine SQL_FIELD_FLAG_DIRTY    0x1

-//efine SQL_FIELD_FLAG_NULL     0x2

-

-// Update options flags

-#define SQL_SETPOSUPDATES       0x0001

-#define SQL_POSITIONEDSQL       0x0002

-//efine SQL_GDBOUND             0x0004

-

-enum CATINFO {CAT_TAB   =     1,      /* SQLTables                     */

-              CAT_COL   =     2,      /* SQLColumns                    */

-              CAT_KEY   =     3,      /* SQLPrimaryKeys                */

-              CAT_STAT  =     4,      /* SQLStatistics                 */

-              CAT_SPC   =     5};     /* SQLSpecialColumns             */

-

-/***********************************************************************/

-/*  This structure is used to control the catalog functions.           */  

-/***********************************************************************/

-typedef struct tagCATPARM { 

-  CATINFO  Id;                 // Id to indicate function 

-  PQRYRES  Qrp;                // Result set pointer

-	PUCHAR   Tab;								 // Table name or pattern

-	PUCHAR   Pat;  							 // Table type or column pattern

-	SQLLEN* *Vlen;							 // To array of indicator values

-	UWORD   *Status;						 // To status block

-	// For SQLStatistics

-	UWORD    Unique; 					   // Index type

-  UWORD    Accuracy;					 // For Cardinality and Pages

-	// For SQLSpecialColumns 

-  UWORD    ColType;

-  UWORD    Scope; 

-  UWORD    Nullable;

-  } CATPARM; 

-	 

-// ODBC connection to a data source

-class TDBODBC;

-class ODBCCOL;

-class ODBConn;

-

-/***********************************************************************/

-/*  Class DBX (ODBC exception).                                        */

-/***********************************************************************/

-class DBX : public BLOCK {

-  friend class ODBConn;

-  // Construction (by ThrowDBX only) -- destruction

- protected:

-  DBX(RETCODE rc);

- public:

-//virtual ~DBX() {}

-//void operator delete(void*, PGLOBAL, void*) {};

-

-  // Implementation (use ThrowDBX to create)

-  RETCODE GetRC(void) {return m_RC;}

-  PSZ     GetErrorMessage(int i)

-          {return (i >=0 && i < MAX_NUM_OF_MSG) ? m_ErrMsg[i]

-					                                      : "No ODBC error";}

- protected:

-  void    BuildErrorMessage(ODBConn* pdb, HSTMT hstmt = SQL_NULL_HSTMT);

-

-  // Attributes

-  RETCODE m_RC;

-  PSZ     m_ErrMsg[MAX_NUM_OF_MSG];

-  }; // end of DBX class definition

-

-/***********************************************************************/

-/*  ODBConn class.                                                     */

-/***********************************************************************/

-class ODBConn : public BLOCK {

-  friend class DBX;

-	friend PQRYRES GetColumnInfo(PGLOBAL, char*&, char *, int, PVBLK&);

- private:

-  ODBConn();                      // Standard (unused) constructor

-

- public:

-  ODBConn(PGLOBAL g, TDBODBC *tdbp);

-

-  enum DOP {                      // Db Open oPtions

-    traceSQL =        0x0001,     // Trace SQL calls

-    openReadOnly =    0x0002,     // Open database read only

-    useCursorLib =    0x0004,     // Use ODBC cursor lib

-    noOdbcDialog =    0x0008,     // Don't display ODBC Connect dialog

-    forceOdbcDialog = 0x0010};    // Always display ODBC connect dialog

-

-  int  Open(PSZ ConnectString, DWORD Options = 0);

-  void Close(void);

-

-  // Attributes

- public:

-  char  GetQuoteChar(void) {return m_IDQuoteChar;}

-  // Database successfully opened?

-  bool  IsOpen(void) {return m_hdbc != SQL_NULL_HDBC;}

-  PSZ   GetStringInfo(ushort infotype);

-  int   GetMaxValue(ushort infotype);

-  PSZ   GetConnect(void) {return m_Connect;}

-

- public:

-  // Operations

-  void SetLoginTimeout(DWORD sec) {m_LoginTimeout = sec;}

-  void SetQueryTimeout(DWORD sec) {m_QueryTimeout = sec;}

-  int  GetResultSize(char *sql, ODBCCOL *colp);

-  int  ExecDirectSQL(char *sql, ODBCCOL *tocols);

-  int  Fetch(void);

-	int  PrepareSQL(char *sql);

-	bool ExecuteSQL(void);

-	bool BindParam(ODBCCOL *colp);

-	int  GetCatInfo(CATPARM *cap);

-  bool GetDataSources(PQRYRES qrp);

-

- public:

-  // Set special options

-  void OnSetOptions(HSTMT hstmt);

-

-  // Implementation

- public:

-//  virtual ~ODBConn();

-

-  // ODBC operations

- protected:

-  bool Check(RETCODE rc);

-  void ThrowDBX(RETCODE rc, HSTMT hstmt = SQL_NULL_HSTMT);

-  void ThrowDBX(PSZ msg);

-  void AllocConnect(DWORD dwOptions);

-  bool Connect(DWORD Options);

-  void VerifyConnect(void);

-  void GetConnectInfo(void);

-  void Free(void);

-

- protected:

-  // Static members

-  static HENV m_henv;

-  static int  m_nAlloc;            // per-Appl reference to HENV above

-

-  // Members

-  PGLOBAL  m_G;

-  TDBODBC *m_Tdb;

-  HDBC     m_hdbc;

-  HSTMT    m_hstmt;

-  DWORD    m_LoginTimeout;

-  DWORD    m_QueryTimeout;

-  DWORD    m_UpdateOptions;

-  DWORD    m_RowsetSize;

-	int      m_Catver;

-  PSZ      m_Connect;

-  bool     m_Updatable;

-  char     m_IDQuoteChar;

-  }; // end of ODBConn class definition

+/***********************************************************************/
+/*  ODBConn.h : header file for the ODBC connection classes.           */
+/***********************************************************************/
+//nclude <windows.h>                           /* Windows include file */
+//nclude <windowsx.h>                          /* Message crackers     */
+
+/***********************************************************************/
+/*  Included C-definition files required by the interface.             */
+/***********************************************************************/
+#include "block.h"
+
+/***********************************************************************/
+/*  ODBC interface.                                                    */
+/***********************************************************************/
+#include <sql.h>
+#include <sqlext.h>
+
+/***********************************************************************/
+/*  Constants and defines.                                             */
+/***********************************************************************/
+//  Miscellaneous sizing info
+#define MAX_NUM_OF_MSG   10     // Max number of error messages
+//efine MAX_CURRENCY     30     // Max size of Currency($) string
+#define MAX_TNAME_LEN    32     // Max size of table names
+//efine MAX_FNAME_LEN    256    // Max size of field names
+#define MAX_STRING_INFO  256    // Max size of string from SQLGetInfo
+//efine MAX_DNAME_LEN    256    // Max size of Recordset names
+#define MAX_CONNECT_LEN  512    // Max size of Connect string
+//efine MAX_CURSOR_NAME  18     // Max size of a cursor name
+#define DEFAULT_FIELD_TYPE SQL_TYPE_NULL // pick "C" data type to match SQL data type
+
+#if !defined(WIN32)
+typedef unsigned char *PUCHAR;
+#endif   // !WIN32
+
+// Timeout and net wait defaults
+#define DEFAULT_LOGIN_TIMEOUT 15    // seconds to before fail on connect
+#define DEFAULT_QUERY_TIMEOUT 15    // seconds to before fail waiting for results
+
+// Field Flags, used to indicate status of fields
+//efine SQL_FIELD_FLAG_DIRTY    0x1
+//efine SQL_FIELD_FLAG_NULL     0x2
+
+// Update options flags
+#define SQL_SETPOSUPDATES       0x0001
+#define SQL_POSITIONEDSQL       0x0002
+//efine SQL_GDBOUND             0x0004
+
+enum CATINFO {CAT_TAB   =     1,      /* SQLTables                     */
+              CAT_COL   =     2,      /* SQLColumns                    */
+              CAT_KEY   =     3,      /* SQLPrimaryKeys                */
+              CAT_STAT  =     4,      /* SQLStatistics                 */
+              CAT_SPC   =     5};     /* SQLSpecialColumns             */
+
+/***********************************************************************/
+/*  This structure is used to control the catalog functions.           */  
+/***********************************************************************/
+typedef struct tagCATPARM { 
+  CATINFO  Id;                 // Id to indicate function 
+  PQRYRES  Qrp;                // Result set pointer
+  PUCHAR   Tab;                 // Table name or pattern
+  PUCHAR   Pat;                 // Table type or column pattern
+  SQLLEN* *Vlen;               // To array of indicator values
+  UWORD   *Status;             // To status block
+  // For SQLStatistics
+  UWORD    Unique;              // Index type
+  UWORD    Accuracy;           // For Cardinality and Pages
+  // For SQLSpecialColumns 
+  UWORD    ColType;
+  UWORD    Scope; 
+  UWORD    Nullable;
+  } CATPARM; 
+   
+// ODBC connection to a data source
+class TDBODBC;
+class ODBCCOL;
+class ODBConn;
+
+/***********************************************************************/
+/*  Class DBX (ODBC exception).                                        */
+/***********************************************************************/
+class DBX : public BLOCK {
+  friend class ODBConn;
+  // Construction (by ThrowDBX only) -- destruction
+ protected:
+  DBX(RETCODE rc);
+ public:
+//virtual ~DBX() {}
+//void operator delete(void*, PGLOBAL, void*) {};
+
+  // Implementation (use ThrowDBX to create)
+  RETCODE GetRC(void) {return m_RC;}
+  PSZ     GetErrorMessage(int i)
+          {return (i >=0 && i < MAX_NUM_OF_MSG) ? m_ErrMsg[i]
+                                                : "No ODBC error";}
+ protected:
+  void    BuildErrorMessage(ODBConn* pdb, HSTMT hstmt = SQL_NULL_HSTMT);
+
+  // Attributes
+  RETCODE m_RC;
+  PSZ     m_ErrMsg[MAX_NUM_OF_MSG];
+  }; // end of DBX class definition
+
+/***********************************************************************/
+/*  ODBConn class.                                                     */
+/***********************************************************************/
+class ODBConn : public BLOCK {
+  friend class DBX;
+  friend PQRYRES GetColumnInfo(PGLOBAL, char*&, char *, int, PVBLK&);
+ private:
+  ODBConn();                      // Standard (unused) constructor
+
+ public:
+  ODBConn(PGLOBAL g, TDBODBC *tdbp);
+
+  enum DOP {                      // Db Open oPtions
+    traceSQL =        0x0001,     // Trace SQL calls
+    openReadOnly =    0x0002,     // Open database read only
+    useCursorLib =    0x0004,     // Use ODBC cursor lib
+    noOdbcDialog =    0x0008,     // Don't display ODBC Connect dialog
+    forceOdbcDialog = 0x0010};    // Always display ODBC connect dialog
+
+  int  Open(PSZ ConnectString, DWORD Options = 0);
+  void Close(void);
+
+  // Attributes
+ public:
+  char  GetQuoteChar(void) {return m_IDQuoteChar;}
+  // Database successfully opened?
+  bool  IsOpen(void) {return m_hdbc != SQL_NULL_HDBC;}
+  PSZ   GetStringInfo(ushort infotype);
+  int   GetMaxValue(ushort infotype);
+  PSZ   GetConnect(void) {return m_Connect;}
+
+ public:
+  // Operations
+  void SetLoginTimeout(DWORD sec) {m_LoginTimeout = sec;}
+  void SetQueryTimeout(DWORD sec) {m_QueryTimeout = sec;}
+  int  GetResultSize(char *sql, ODBCCOL *colp);
+  int  ExecDirectSQL(char *sql, ODBCCOL *tocols);
+  int  Fetch(void);
+  int  PrepareSQL(char *sql);
+  bool ExecuteSQL(void);
+  bool BindParam(ODBCCOL *colp);
+  int  GetCatInfo(CATPARM *cap);
+  bool GetDataSources(PQRYRES qrp);
+
+ public:
+  // Set special options
+  void OnSetOptions(HSTMT hstmt);
+
+  // Implementation
+ public:
+//  virtual ~ODBConn();
+
+  // ODBC operations
+ protected:
+  bool Check(RETCODE rc);
+  void ThrowDBX(RETCODE rc, HSTMT hstmt = SQL_NULL_HSTMT);
+  void ThrowDBX(PSZ msg);
+  void AllocConnect(DWORD dwOptions);
+  bool Connect(DWORD Options);
+  void VerifyConnect(void);
+  void GetConnectInfo(void);
+  void Free(void);
+
+ protected:
+  // Static members
+  static HENV m_henv;
+  static int  m_nAlloc;            // per-Appl reference to HENV above
+
+  // Members
+  PGLOBAL  m_G;
+  TDBODBC *m_Tdb;
+  HDBC     m_hdbc;
+  HSTMT    m_hstmt;
+  DWORD    m_LoginTimeout;
+  DWORD    m_QueryTimeout;
+  DWORD    m_UpdateOptions;
+  DWORD    m_RowsetSize;
+  int      m_Catver;
+  PSZ      m_Connect;
+  bool     m_Updatable;
+  char     m_IDQuoteChar;
+  }; // end of ODBConn class definition