Include file alignment fixes.

Author: bmomjian

src/interfaces/odbc/columninfo.h

@@ -36,9 +36,9 @@ char		CI_read_fields(ColumnInfoClass *self, ConnectionClass *conn);
 
 /* functions for setting up the fields from within the program, */
 /* without reading from a socket */
-void CI_set_num_fields(ColumnInfoClass *self, int new_num_fields);
+void		CI_set_num_fields(ColumnInfoClass *self, int new_num_fields);
 void CI_set_field_info(ColumnInfoClass *self, int field_num, char *new_name,
-		  Oid new_adtid, Int2 new_adtsize, Int4 atttypmod);
+				  Oid new_adtid, Int2 new_adtsize, Int4 atttypmod);
 
 
 #endif

src/interfaces/odbc/connection.h

@@ -93,11 +93,11 @@ typedef enum
 #define AUTH_REQ_CRYPT		4
 
 /*	Startup Packet sizes */
-#define SM_DATABASE		64
-#define SM_USER			32
-#define SM_OPTIONS		64
-#define SM_UNUSED		64
-#define SM_TTY			64
+#define SM_DATABASE			64
+#define SM_USER				32
+#define SM_OPTIONS			64
+#define SM_UNUSED			64
+#define SM_TTY				64
 
 /*	Old 6.2 protocol defines */
 #define NO_AUTHENTICATION	7
@@ -200,26 +200,26 @@ struct col_info
 #endif
 
 typedef BOOL (FAR WINAPI * DataSourceToDriverProc) (UDWORD,
-													SWORD,
-													PTR,
-													SDWORD,
-													PTR,
-													SDWORD,
-													SDWORD FAR *,
-													UCHAR FAR *,
-													SWORD,
-													SWORD FAR *);
+																SWORD,
+																PTR,
+																SDWORD,
+																PTR,
+																SDWORD,
+															SDWORD FAR *,
+															 UCHAR FAR *,
+																SWORD,
+															SWORD FAR *);
 
 typedef BOOL (FAR WINAPI * DriverToDataSourceProc) (UDWORD,
-													SWORD,
-													PTR,
-													SDWORD,
-													PTR,
-													SDWORD,
-													SDWORD FAR *,
-													UCHAR FAR *,
-													SWORD,
-													SWORD FAR *);
+																SWORD,
+																PTR,
+																SDWORD,
+																PTR,
+																SDWORD,
+															SDWORD FAR *,
+															 UCHAR FAR *,
+																SWORD,
+															SWORD FAR *);
 
 /*******	The Connection handle	************/
 struct ConnectionClass_
@@ -255,12 +255,12 @@ struct ConnectionClass_
 
 
 /* Accessor functions */
-#define CC_get_socket(x)	(x->sock)
-#define CC_get_database(x)	(x->connInfo.database)
-#define CC_get_server(x)	(x->connInfo.server)
-#define CC_get_DSN(x)		(x->connInfo.dsn)
-#define CC_get_username(x)	(x->connInfo.username)
-#define CC_is_onlyread(x)	(x->connInfo.onlyread[0] == '1')
+#define CC_get_socket(x)		(x->sock)
+#define CC_get_database(x)		(x->connInfo.database)
+#define CC_get_server(x)		(x->connInfo.server)
+#define CC_get_DSN(x)			(x->connInfo.dsn)
+#define CC_get_username(x)		(x->connInfo.username)
+#define CC_is_onlyread(x)		(x->connInfo.onlyread[0] == '1')
 
 
 /*	for CC_DSN_info */

src/interfaces/odbc/dlg_specific.h

@@ -31,46 +31,47 @@
 
 /* INI File Stuff */
 #ifndef WIN32
-#define ODBC_INI		".odbc.ini"
+#define ODBC_INI			".odbc.ini"
 #ifdef ODBCINSTDIR
-#define ODBCINST_INI	ODBCINSTDIR "/odbcinst.ini"
+#define ODBCINST_INI		ODBCINSTDIR "/odbcinst.ini"
 #else
-#define ODBCINST_INI	"/etc/odbcinst.ini"
+#define ODBCINST_INI		"/etc/odbcinst.ini"
 #warning "location of odbcinst.ini file defaulted to /etc"
 #endif
 #else							/* WIN32 */
-#define ODBC_INI		"ODBC.INI"		/* ODBC initialization file */
-#define ODBCINST_INI	"ODBCINST.INI"	/* ODBC Installation file */
+#define ODBC_INI			"ODBC.INI"	/* ODBC initialization file */
+#define ODBCINST_INI		"ODBCINST.INI"		/* ODBC Installation file */
 #endif	 /* WIN32 */
 
 
-#define INI_DSN			  DBMS_NAME		/* Name of default Datasource in
+#define INI_DSN				DBMS_NAME	/* Name of default Datasource in
 										 * ini file (not used?) */
-#define INI_KDESC		  "Description" /* Data source description */
-#define INI_SERVER		  "Servername"	/* Name of Server running the
-										 * Postgres service */
-#define INI_PORT		  "Port"/* Port on which the Postmaster is
-								 * listening */
-#define INI_DATABASE	  "Database"	/* Database Name */
-#define INI_USER		  "Username"	/* Default User Name */
-#define INI_PASSWORD	  "Password"	/* Default Password */
-#define INI_DEBUG		  "Debug"		/* Debug flag */
-#define INI_FETCH		  "Fetch"		/* Fetch Max Count */
-#define INI_SOCKET		  "Socket"		/* Socket buffer size */
-#define INI_READONLY	  "ReadOnly"	/* Database is read only */
-#define INI_COMMLOG		  "CommLog"		/* Communication to backend
+#define INI_KDESC			"Description"		/* Data source description */
+#define INI_SERVER			"Servername"		/* Name of Server running
+												 * the Postgres service */
+#define INI_PORT			"Port"		/* Port on which the Postmaster is
+										 * listening */
+#define INI_DATABASE		"Database"	/* Database Name */
+#define INI_USER			"Username"	/* Default User Name */
+#define INI_PASSWORD		"Password"	/* Default Password */
+#define INI_DEBUG			"Debug"		/* Debug flag */
+#define INI_FETCH			"Fetch"		/* Fetch Max Count */
+#define INI_SOCKET			"Socket"	/* Socket buffer size */
+#define INI_READONLY		"ReadOnly"	/* Database is read only */
+#define INI_COMMLOG			"CommLog"	/* Communication to backend
 										 * logging */
-#define INI_PROTOCOL	  "Protocol"	/* What protocol (6.2) */
-#define INI_OPTIMIZER	  "Optimizer"	/* Use backend genetic optimizer */
-#define INI_KSQO		  "Ksqo"/* Keyset query optimization */
-#define INI_CONNSETTINGS  "ConnSettings"		/* Anything to send to
+#define INI_PROTOCOL		"Protocol"	/* What protocol (6.2) */
+#define INI_OPTIMIZER		"Optimizer" /* Use backend genetic optimizer */
+#define INI_KSQO			"Ksqo"		/* Keyset query optimization */
+#define INI_CONNSETTINGS	"ConnSettings"		/* Anything to send to
 												 * backend on successful
 												 * connection */
-#define INI_UNIQUEINDEX   "UniqueIndex" /* Recognize unique indexes */
-#define INI_UNKNOWNSIZES  "UnknownSizes"		/* How to handle unknown
+#define INI_UNIQUEINDEX		"UniqueIndex"		/* Recognize unique
+												 * indexes */
+#define INI_UNKNOWNSIZES	"UnknownSizes"		/* How to handle unknown
 												 * result set sizes */
 
-#define INI_CANCELASFREESTMT  "CancelAsFreeStmt"
+#define INI_CANCELASFREESTMT	"CancelAsFreeStmt"
 
 #define INI_USEDECLAREFETCH "UseDeclareFetch"	/* Use Declare/Fetch
 												 * cursors */
@@ -90,9 +91,9 @@
 #define INI_PARSE					"Parse"
 #define INI_EXTRASYSTABLEPREFIXES	"ExtraSysTablePrefixes"
 
-#define INI_TRANSLATIONNAME		  "TranslationName"
-#define INI_TRANSLATIONDLL		  "TranslationDLL"
-#define INI_TRANSLATIONOPTION	  "TranslationOption"
+#define INI_TRANSLATIONNAME			"TranslationName"
+#define INI_TRANSLATIONDLL			"TranslationDLL"
+#define INI_TRANSLATIONOPTION		"TranslationOption"
 
 
 /*	Connection Defaults */

src/interfaces/odbc/gpps.h

@@ -17,22 +17,22 @@ extern		"C"
 {
 #endif
 
-DWORD		GetPrivateProfileString(char *theSection,		/* section name */
-									char *theKey,		/* search key name */
-									char *theDefault,	/* default value if not
-														 * found */
-									char *theReturnBuffer,		/* return valuse stored
-																 * here */
-								  size_t theBufferLength,		/* byte length of return
-																 * buffer */
-									char *theIniFileName);		/* pathname of ini file
-																 * to search */
-
-DWORD		WritePrivateProfileString(char *theSection,		/* section name */
-								  char *theKey,		/* write key name */
-								  char *theBuffer,	/* input buffer */
-								  char *theIniFileName);		/* pathname of ini file
-																 * to write */
+	DWORD		GetPrivateProfileString(char *theSection,		/* section name */
+													char *theKey,		/* search key name */
+													char *theDefault,	/* default value if not
+																		 * found */
+													char *theReturnBuffer,		/* return valuse stored
+																				 * here */
+												  size_t theBufferLength,		/* byte length of return
+																				 * buffer */
+													char *theIniFileName);		/* pathname of ini file
+																				 * to search */
+
+	DWORD		WritePrivateProfileString(char *theSection,		/* section name */
+													  char *theKey,		/* write key name */
+													  char *theBuffer,	/* input buffer */
+												   char *theIniFileName);		/* pathname of ini file
+																				 * to write */
 
 #ifdef __cplusplus
 }

src/interfaces/odbc/iodbc.h

@@ -57,10 +57,10 @@ typedef int BOOL;
 
 #endif	 /* WIN32 */
 
-#define  SYSERR    (-1)
+#define  SYSERR		(-1)
 
 #ifndef  NULL
-#define  NULL		 ((void FAR*)0UL)
+#define  NULL		((void FAR*)0UL)
 #endif
 
 #endif