- Fixing TAB to 2 spaces

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

1 files changed, 180 insertions, 180 deletions

diff --git a/storage/connect/colblk.h b/storage/connect/colblk.h
index 84dcb4284af..3e6b9f3ee05 100644
--- a/storage/connect/colblk.h
+++ b/storage/connect/colblk.h
@@ -1,180 +1,180 @@
-/*************** Colblk H Declares Source Code File (.H) ***************/

-/*  Name: COLBLK.H    Version 1.5                                      */

-/*                                                                     */

-/*  (C) Copyright to the author Olivier BERTRAND          2005-2012    */

-/*                                                                     */

-/*  This file contains the COLBLK and derived classes declares.        */

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

-#ifndef __COLBLK__H

-#define  __COLBLK__H

-

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

-/*  Include required application header files                          */

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

-#include "xobject.h"

-#include "reldef.h"

-

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

-/*  Class COLBLK: Base class for table column descriptors.             */

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

-class DllExport COLBLK : public XOBJECT {

-  friend class TDBPIVOT;

- protected:

-  // Default constructors used by derived classes

-  COLBLK(PCOLDEF cdp = NULL, PTDB tdbp = NULL, int i = 0);

-  COLBLK(PCOL colp, PTDB tdbp = NULL);     // Used in copy process

-	COLBLK(int n) {}     // Used when changing a column class in TDBXML

-

- public:

-  // Implementation

-  virtual int     GetType(void) {return TYPE_COLBLK;}

-  virtual int     GetResultType(void) {return Buf_Type;}

-  virtual int     GetPrecision(void) {return Format.Prec;}

-  virtual int     GetLength(void) {return Long;}

-  virtual int     GetLengthEx(void);

-  virtual int     GetAmType() {return TYPE_AM_ERROR;}

-  virtual void    SetOk(void) {Status |= BUF_EMPTY;}

-  virtual PTDB    GetTo_Tdb(void) {return To_Tdb;}

-          PCOL    GetNext(void) {return Next;}

-          PSZ     GetName(void) {return Name;}

-          int     GetIndex(void) {return Index;}

-	        int     GetOpt(void) {return Opt;}

-          ushort  GetColUse(void) {return ColUse;}

-          ushort  GetColUse(ushort u) {return (ColUse & u);}

-          ushort  GetStatus(void) {return Status;}

-          ushort  GetStatus(ushort u) {return (Status & u);}

-          void    SetColUse(ushort u) {ColUse = u;}

-          void    SetStatus(ushort u) {Status = u;}

-          void    AddColUse(ushort u) {ColUse |= u;}

-          void    AddStatus(ushort u) {Status |= u;}

-          void    SetNext(PCOL cp) {Next = cp;}

-	        void    SetKcol(PXCOL kcp) {To_Kcol = kcp;}

-					PCOLDEF GetCdp(void) {return Cdp;}

-	        PSZ     GetDomain(void) {return (Cdp) ? Cdp->Decode : NULL;}

-          PSZ     GetDesc(void) {return (Cdp) ? Cdp->Desc : NULL;}

-          PSZ     GetFmt(void) {return (Cdp) ? Cdp->Fmt : NULL;}

-								  

-  // Methods		  

-  virtual void    Reset(void);

-  virtual bool    Compare(PXOB xp);

-  virtual bool    SetFormat(PGLOBAL, FORMAT&);

-  virtual int     CheckColumn(PGLOBAL g, PSQL sqlp, PXOB &xp, int &ag);

-  virtual bool    IsSpecial(void) {return false;}

-  virtual int			CheckSpcCol(PTDB tdbp, int n) {return 2;}

-  virtual bool    CheckSort(PTDB tdbp);

-  virtual void    MarkCol(ushort bits);

-  virtual bool    Eval(PGLOBAL g);

-  virtual bool    SetBuffer(PGLOBAL g, PVAL value, bool ok, bool check);

-	virtual void    SetTo_Val(PVAL valp) {}

-  virtual void    ReadColumn(PGLOBAL g);

-  virtual void    WriteColumn(PGLOBAL g);

-  virtual void    Print(PGLOBAL g, FILE *, uint);

-  virtual void    Print(PGLOBAL g, char *, uint);

-	virtual bool	  VarSize(void) {return false;}

-	virtual bool	  IsColInside(PCOL colp) {return this == colp;}

-          bool    InitValue(PGLOBAL g);

-

- protected:

-  // Members

-  PCOL    Next;                // Next column in table

-  PSZ     Name;                // Column name

-	PCOLDEF Cdp;								 // To column definition block

-  PTDB    To_Tdb;              // Points to Table Descriptor Block

-	PXCOL   To_Kcol;             // Points to Xindex matching column

-  int     Index;               // Column number in table

-	int     Opt;                 // Cluster/sort information

-  int     Buf_Type;            // Data type

-  int     Long;                // Internal length in table

-  FORMAT  Format;              // Output format

-  ushort  ColUse;              // Column usage

-  ushort  Status;              // Column read status

-  }; // end of class COLBLK

-

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

-/*  Class SPCBLK: Base class for special column descriptors.           */

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

-class SPCBLK : public COLBLK {

- public:

-  // Constructor

-  SPCBLK(PCOLUMN cp);

-

-  // Implementation

-  virtual int  GetAmType(void) = 0;

-	virtual	bool GetRnm(void) {return false;}

-

-  // Methods

-  virtual bool IsSpecial(void) {return true;}

-  virtual void ReadColumn(PGLOBAL g) = 0;

-  virtual void WriteColumn(PGLOBAL g);

-

- protected:

-  // Default constructor not to be used

-	SPCBLK(void) : COLBLK(1) {}

-  }; // end of class SPCBLK

-

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

-/*  Class RIDBLK: ROWID special column descriptor.                     */

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

-class RIDBLK : public SPCBLK {

- public:

-  // Constructor

-  RIDBLK(PCOLUMN cp, bool rnm);

-

-  // Implementation

-  virtual int  GetAmType(void) {return TYPE_AM_ROWID;}

-	virtual	bool GetRnm(void) {return Rnm;}

-

-  // Methods

-  virtual void ReadColumn(PGLOBAL g);

-

- protected:

-	bool Rnm;												 // False for RowID, True for RowNum

-  }; // end of class RIDBLK

-

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

-/*  Class FIDBLK: FILEID special column descriptor.                    */

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

-class FIDBLK : public SPCBLK {

- public:

-  // Constructor

-  FIDBLK(PCOLUMN cp);

-

-  // Implementation

-  virtual int  GetAmType(void) {return TYPE_AM_FILID;}

-

-  // Methods

-  virtual void Reset(void) {}		   // This is a pseudo constant column

-  virtual int  CheckSpcCol(PTDB tdbp, int n) 

-	{return (n == 2 && tdbp == To_Tdb) ? 1 : 2;}

-  virtual void ReadColumn(PGLOBAL g);

-

- protected:

-	PSZ  Fn;												 // The current To_File of the table

-  }; // end of class FIDBLK

-

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

-/*  Class TIDBLK: TABID special column descriptor.                     */

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

-class TIDBLK : public SPCBLK {

- public:

-  // Constructor

-  TIDBLK(PCOLUMN cp);

-

-  // Implementation

-  virtual int  GetAmType(void) {return TYPE_AM_TABID;}

-

-  // Methods

-  virtual void Reset(void) {}		   // This is a pseudo constant column

-  virtual int  CheckSpcCol(PTDB tdbp, int n)

-	{return (n == 3 && tdbp == To_Tdb) ? 1 : 2;}

-  virtual void ReadColumn(PGLOBAL g);

-

- protected:

-  // Default constructor not to be used

-	TIDBLK(void) {}

-

-	// Members

-	PSZ  Tname;											 // The current table name

-  }; // end of class TIDBLK

-

-#endif // __COLBLK__H

+/*************** Colblk H Declares Source Code File (.H) ***************/
+/*  Name: COLBLK.H    Version 1.5                                      */
+/*                                                                     */
+/*  (C) Copyright to the author Olivier BERTRAND          2005-2012    */
+/*                                                                     */
+/*  This file contains the COLBLK and derived classes declares.        */
+/***********************************************************************/
+#ifndef __COLBLK__H
+#define  __COLBLK__H
+
+/***********************************************************************/
+/*  Include required application header files                          */
+/***********************************************************************/
+#include "xobject.h"
+#include "reldef.h"
+
+/***********************************************************************/
+/*  Class COLBLK: Base class for table column descriptors.             */
+/***********************************************************************/
+class DllExport COLBLK : public XOBJECT {
+  friend class TDBPIVOT;
+ protected:
+  // Default constructors used by derived classes
+  COLBLK(PCOLDEF cdp = NULL, PTDB tdbp = NULL, int i = 0);
+  COLBLK(PCOL colp, PTDB tdbp = NULL);     // Used in copy process
+  COLBLK(int n) {}     // Used when changing a column class in TDBXML
+
+ public:
+  // Implementation
+  virtual int     GetType(void) {return TYPE_COLBLK;}
+  virtual int     GetResultType(void) {return Buf_Type;}
+  virtual int     GetPrecision(void) {return Format.Prec;}
+  virtual int     GetLength(void) {return Long;}
+  virtual int     GetLengthEx(void);
+  virtual int     GetAmType() {return TYPE_AM_ERROR;}
+  virtual void    SetOk(void) {Status |= BUF_EMPTY;}
+  virtual PTDB    GetTo_Tdb(void) {return To_Tdb;}
+          PCOL    GetNext(void) {return Next;}
+          PSZ     GetName(void) {return Name;}
+          int     GetIndex(void) {return Index;}
+          int     GetOpt(void) {return Opt;}
+          ushort  GetColUse(void) {return ColUse;}
+          ushort  GetColUse(ushort u) {return (ColUse & u);}
+          ushort  GetStatus(void) {return Status;}
+          ushort  GetStatus(ushort u) {return (Status & u);}
+          void    SetColUse(ushort u) {ColUse = u;}
+          void    SetStatus(ushort u) {Status = u;}
+          void    AddColUse(ushort u) {ColUse |= u;}
+          void    AddStatus(ushort u) {Status |= u;}
+          void    SetNext(PCOL cp) {Next = cp;}
+          void    SetKcol(PXCOL kcp) {To_Kcol = kcp;}
+          PCOLDEF GetCdp(void) {return Cdp;}
+          PSZ     GetDomain(void) {return (Cdp) ? Cdp->Decode : NULL;}
+          PSZ     GetDesc(void) {return (Cdp) ? Cdp->Desc : NULL;}
+          PSZ     GetFmt(void) {return (Cdp) ? Cdp->Fmt : NULL;}
+                  
+  // Methods      
+  virtual void    Reset(void);
+  virtual bool    Compare(PXOB xp);
+  virtual bool    SetFormat(PGLOBAL, FORMAT&);
+  virtual int     CheckColumn(PGLOBAL g, PSQL sqlp, PXOB &xp, int &ag);
+  virtual bool    IsSpecial(void) {return false;}
+  virtual int      CheckSpcCol(PTDB tdbp, int n) {return 2;}
+  virtual bool    CheckSort(PTDB tdbp);
+  virtual void    MarkCol(ushort bits);
+  virtual bool    Eval(PGLOBAL g);
+  virtual bool    SetBuffer(PGLOBAL g, PVAL value, bool ok, bool check);
+  virtual void    SetTo_Val(PVAL valp) {}
+  virtual void    ReadColumn(PGLOBAL g);
+  virtual void    WriteColumn(PGLOBAL g);
+  virtual void    Print(PGLOBAL g, FILE *, uint);
+  virtual void    Print(PGLOBAL g, char *, uint);
+  virtual bool    VarSize(void) {return false;}
+  virtual bool    IsColInside(PCOL colp) {return this == colp;}
+          bool    InitValue(PGLOBAL g);
+
+ protected:
+  // Members
+  PCOL    Next;                // Next column in table
+  PSZ     Name;                // Column name
+  PCOLDEF Cdp;                 // To column definition block
+  PTDB    To_Tdb;              // Points to Table Descriptor Block
+  PXCOL   To_Kcol;             // Points to Xindex matching column
+  int     Index;               // Column number in table
+  int     Opt;                 // Cluster/sort information
+  int     Buf_Type;            // Data type
+  int     Long;                // Internal length in table
+  FORMAT  Format;              // Output format
+  ushort  ColUse;              // Column usage
+  ushort  Status;              // Column read status
+  }; // end of class COLBLK
+
+/***********************************************************************/
+/*  Class SPCBLK: Base class for special column descriptors.           */
+/***********************************************************************/
+class SPCBLK : public COLBLK {
+ public:
+  // Constructor
+  SPCBLK(PCOLUMN cp);
+
+  // Implementation
+  virtual int  GetAmType(void) = 0;
+  virtual  bool GetRnm(void) {return false;}
+
+  // Methods
+  virtual bool IsSpecial(void) {return true;}
+  virtual void ReadColumn(PGLOBAL g) = 0;
+  virtual void WriteColumn(PGLOBAL g);
+
+ protected:
+  // Default constructor not to be used
+  SPCBLK(void) : COLBLK(1) {}
+  }; // end of class SPCBLK
+
+/***********************************************************************/
+/*  Class RIDBLK: ROWID special column descriptor.                     */
+/***********************************************************************/
+class RIDBLK : public SPCBLK {
+ public:
+  // Constructor
+  RIDBLK(PCOLUMN cp, bool rnm);
+
+  // Implementation
+  virtual int  GetAmType(void) {return TYPE_AM_ROWID;}
+  virtual  bool GetRnm(void) {return Rnm;}
+
+  // Methods
+  virtual void ReadColumn(PGLOBAL g);
+
+ protected:
+  bool Rnm;                         // False for RowID, True for RowNum
+  }; // end of class RIDBLK
+
+/***********************************************************************/
+/*  Class FIDBLK: FILEID special column descriptor.                    */
+/***********************************************************************/
+class FIDBLK : public SPCBLK {
+ public:
+  // Constructor
+  FIDBLK(PCOLUMN cp);
+
+  // Implementation
+  virtual int  GetAmType(void) {return TYPE_AM_FILID;}
+
+  // Methods
+  virtual void Reset(void) {}       // This is a pseudo constant column
+  virtual int  CheckSpcCol(PTDB tdbp, int n) 
+  {return (n == 2 && tdbp == To_Tdb) ? 1 : 2;}
+  virtual void ReadColumn(PGLOBAL g);
+
+ protected:
+  PSZ  Fn;                         // The current To_File of the table
+  }; // end of class FIDBLK
+
+/***********************************************************************/
+/*  Class TIDBLK: TABID special column descriptor.                     */
+/***********************************************************************/
+class TIDBLK : public SPCBLK {
+ public:
+  // Constructor
+  TIDBLK(PCOLUMN cp);
+
+  // Implementation
+  virtual int  GetAmType(void) {return TYPE_AM_TABID;}
+
+  // Methods
+  virtual void Reset(void) {}       // This is a pseudo constant column
+  virtual int  CheckSpcCol(PTDB tdbp, int n)
+  {return (n == 3 && tdbp == To_Tdb) ? 1 : 2;}
+  virtual void ReadColumn(PGLOBAL g);
+
+ protected:
+  // Default constructor not to be used
+  TIDBLK(void) {}
+
+  // Members
+  PSZ  Tname;                       // The current table name
+  }; // end of class TIDBLK
+
+#endif // __COLBLK__H