ODBC source code cleanup. Mostly alignment of #define constants.

bind.c

@@ -1,4 +1,3 @@
-
 /* Module:			bind.c
  *
  * Description:		This module contains routines related to binding

bind.h

@@ -1,4 +1,3 @@
-
 /* File:			bind.h
  *
  * Description:		See "bind.c"

columninfo.c

@@ -1,4 +1,3 @@
-
 /* Module:			columninfo.c
  *
  * Description:		This module contains routines related to

columninfo.h

@@ -1,4 +1,3 @@
-
 /* File:			columninfo.h
  *
  * Description:		See "columninfo.c"
@@ -40,5 +39,4 @@ 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);
 
-
 #endif

connection.c

@@ -1,4 +1,3 @@
-
 /* Module:			connection.c
  *
  * Description:		This module contains routines related to

connection.h

@@ -1,4 +1,3 @@
-
 /* File:			connection.h
  *
  * Description:		See "connection.c"
@@ -38,41 +37,41 @@ typedef enum
 } CONN_Status;
 
 /*	These errors have general sql error state */
-#define CONNECTION_SERVER_NOT_REACHED 101
-#define CONNECTION_MSG_TOO_LONG 103
-#define CONNECTION_COULD_NOT_SEND 104
-#define CONNECTION_NO_SUCH_DATABASE 105
-#define CONNECTION_BACKEND_CRAZY 106
-#define CONNECTION_NO_RESPONSE 107
-#define CONNECTION_SERVER_REPORTED_ERROR 108
-#define CONNECTION_COULD_NOT_RECEIVE 109
-#define CONNECTION_SERVER_REPORTED_WARNING 110
-#define CONNECTION_NEED_PASSWORD 112
+#define CONNECTION_SERVER_NOT_REACHED				101
+#define CONNECTION_MSG_TOO_LONG						103
+#define CONNECTION_COULD_NOT_SEND					104
+#define CONNECTION_NO_SUCH_DATABASE					105
+#define CONNECTION_BACKEND_CRAZY					106
+#define CONNECTION_NO_RESPONSE						107
+#define CONNECTION_SERVER_REPORTED_ERROR			108
+#define CONNECTION_COULD_NOT_RECEIVE				109
+#define CONNECTION_SERVER_REPORTED_WARNING			110
+#define CONNECTION_NEED_PASSWORD					112
 
 /*	These errors correspond to specific SQL states */
-#define CONN_INIREAD_ERROR 201
-#define CONN_OPENDB_ERROR 202
-#define CONN_STMT_ALLOC_ERROR 203
-#define CONN_IN_USE 204
-#define CONN_UNSUPPORTED_OPTION 205
+#define CONN_INIREAD_ERROR							201
+#define CONN_OPENDB_ERROR							202
+#define CONN_STMT_ALLOC_ERROR						203
+#define CONN_IN_USE									204
+#define CONN_UNSUPPORTED_OPTION						205
 /* Used by SetConnectoption to indicate unsupported options */
-#define CONN_INVALID_ARGUMENT_NO 206
+#define CONN_INVALID_ARGUMENT_NO					206
 /* SetConnectOption: corresponds to ODBC--"S1009" */
-#define CONN_TRANSACT_IN_PROGRES 207
-#define CONN_NO_MEMORY_ERROR 208
-#define CONN_NOT_IMPLEMENTED_ERROR 209
-#define CONN_INVALID_AUTHENTICATION 210
-#define CONN_AUTH_TYPE_UNSUPPORTED 211
-#define CONN_UNABLE_TO_LOAD_DLL 212
+#define CONN_TRANSACT_IN_PROGRES					207
+#define CONN_NO_MEMORY_ERROR						208
+#define CONN_NOT_IMPLEMENTED_ERROR					209
+#define CONN_INVALID_AUTHENTICATION					210
+#define CONN_AUTH_TYPE_UNSUPPORTED					211
+#define CONN_UNABLE_TO_LOAD_DLL						212
 
-#define CONN_OPTION_VALUE_CHANGED 213
-#define CONN_VALUE_OUT_OF_RANGE 214
+#define CONN_OPTION_VALUE_CHANGED					213
+#define CONN_VALUE_OUT_OF_RANGE						214
 
-#define CONN_TRUNCATED 215
+#define CONN_TRUNCATED								215
 
 /* Conn_status defines */
-#define CONN_IN_AUTOCOMMIT 0x01
-#define CONN_IN_TRANSACTION 0x02
+#define CONN_IN_AUTOCOMMIT							0x01
+#define CONN_IN_TRANSACTION							0x02
 
 /* AutoCommit functions */
 #define CC_set_autocommit_off(x)	(x->transact_status &= ~CONN_IN_AUTOCOMMIT)
@@ -86,31 +85,31 @@ typedef enum
 
 
 /* Authentication types */
-#define AUTH_REQ_OK			0
-#define AUTH_REQ_KRB4		1
-#define AUTH_REQ_KRB5		2
-#define AUTH_REQ_PASSWORD	3
-#define AUTH_REQ_CRYPT		4
+#define AUTH_REQ_OK									0
+#define AUTH_REQ_KRB4								1
+#define AUTH_REQ_KRB5								2
+#define AUTH_REQ_PASSWORD							3
+#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
-#define PATH_SIZE			64
-#define ARGV_SIZE			64
-#define NAMEDATALEN			16
+#define NO_AUTHENTICATION							7
+#define PATH_SIZE									64
+#define ARGV_SIZE									64
+#define NAMEDATALEN									16
 
 typedef unsigned int ProtocolVersion;
 
 #define PG_PROTOCOL(major, minor)	(((major) << 16) | (minor))
-#define PG_PROTOCOL_LATEST		PG_PROTOCOL(2, 0)
-#define PG_PROTOCOL_63			PG_PROTOCOL(1, 0)
-#define PG_PROTOCOL_62			PG_PROTOCOL(0, 0)
+#define PG_PROTOCOL_LATEST							PG_PROTOCOL(2, 0)
+#define PG_PROTOCOL_63								PG_PROTOCOL(1, 0)
+#define PG_PROTOCOL_62								PG_PROTOCOL(0, 0)
 
 /*	This startup packet is to support latest Postgres protocol (6.4, 6.3) */
 typedef struct _StartupPacket
@@ -275,12 +274,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 */

convert.c

@@ -1,4 +1,3 @@
-
 /* Module:		   convert.c
  *
  * Description:    This module contains routines related to

convert.h

@@ -1,4 +1,3 @@
-
 /* File:			convert.h
  *
  * Description:		See "convert.c"
@@ -13,12 +12,12 @@
 #include "psqlodbc.h"
 
 /* copy_and_convert results */
-#define COPY_OK						 0
-#define COPY_UNSUPPORTED_TYPE		 1
-#define COPY_UNSUPPORTED_CONVERSION  2
-#define COPY_RESULT_TRUNCATED		 3
-#define COPY_GENERAL_ERROR			 4
-#define COPY_NO_DATA_FOUND			 5
+#define COPY_OK									0
+#define COPY_UNSUPPORTED_TYPE					1
+#define COPY_UNSUPPORTED_CONVERSION				2
+#define COPY_RESULT_TRUNCATED					3
+#define COPY_GENERAL_ERROR						4
+#define COPY_NO_DATA_FOUND						5
 
 typedef struct
 {

dlg_specific.c

@@ -1,4 +1,3 @@
-
 /* Module:			dlg_specific.c
  *
  * Description:		This module contains any specific code for handling

dlg_specific.h

@@ -1,4 +1,3 @@
-
 /* File:			dlg_specific.h
  *
  * Description:		See "dlg_specific.c"
@@ -25,73 +24,81 @@
 #endif
 
 /*	Unknown data type sizes */
-#define UNKNOWNS_AS_MAX				0
-#define UNKNOWNS_AS_DONTKNOW		1
-#define UNKNOWNS_AS_LONGEST			2
+#define UNKNOWNS_AS_MAX					0
+#define UNKNOWNS_AS_DONTKNOW			1
+#define UNKNOWNS_AS_LONGEST				2
 
 /* 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"
 #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
-										 * 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
-										 * 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
-												 * backend on successful
-												 * connection */
-#define INI_UNIQUEINDEX   "UniqueIndex" /* Recognize unique indexes */
-#define INI_UNKNOWNSIZES  "UnknownSizes"		/* How to handle unknown
-												 * result set sizes */
-
-#define INI_CANCELASFREESTMT  "CancelAsFreeStmt"
-
-#define INI_USEDECLAREFETCH "UseDeclareFetch"	/* Use Declare/Fetch
-												 * cursors */
+#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 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
+														 * backend on successful
+														 * connection */
+#define INI_UNIQUEINDEX					"UniqueIndex"	/* Recognize unique
+														 * indexes */
+#define INI_UNKNOWNSIZES				"UnknownSizes"	/* How to handle unknown
+														 * result set sizes */
+
+#define INI_CANCELASFREESTMT			"CancelAsFreeStmt"
+
+#define INI_USEDECLAREFETCH				"UseDeclareFetch"		/* Use Declare/Fetch
+																 * cursors */
 
 /*	More ini stuff */
-#define INI_TEXTASLONGVARCHAR		"TextAsLongVarchar"
-#define INI_UNKNOWNSASLONGVARCHAR	"UnknownsAsLongVarchar"
-#define INI_BOOLSASCHAR				"BoolsAsChar"
-#define INI_MAXVARCHARSIZE			"MaxVarcharSize"
-#define INI_MAXLONGVARCHARSIZE		"MaxLongVarcharSize"
-
-#define INI_FAKEOIDINDEX			"FakeOidIndex"
-#define INI_SHOWOIDCOLUMN			"ShowOidColumn"
-#define INI_ROWVERSIONING			"RowVersioning"
-#define INI_SHOWSYSTEMTABLES		"ShowSystemTables"
-#define INI_LIE						"Lie"
-#define INI_PARSE					"Parse"
-#define INI_EXTRASYSTABLEPREFIXES	"ExtraSysTablePrefixes"
-
-#define INI_TRANSLATIONNAME		  "TranslationName"
-#define INI_TRANSLATIONDLL		  "TranslationDLL"
-#define INI_TRANSLATIONOPTION	  "TranslationOption"
+#define INI_TEXTASLONGVARCHAR			"TextAsLongVarchar"
+#define INI_UNKNOWNSASLONGVARCHAR		"UnknownsAsLongVarchar"
+#define INI_BOOLSASCHAR					"BoolsAsChar"
+#define INI_MAXVARCHARSIZE				"MaxVarcharSize"
+#define INI_MAXLONGVARCHARSIZE			"MaxLongVarcharSize"
+
+#define INI_FAKEOIDINDEX				"FakeOidIndex"
+#define INI_SHOWOIDCOLUMN				"ShowOidColumn"
+#define INI_ROWVERSIONING				"RowVersioning"
+#define INI_SHOWSYSTEMTABLES			"ShowSystemTables"
+#define INI_LIE							"Lie"
+#define INI_PARSE						"Parse"
+#define INI_EXTRASYSTABLEPREFIXES		"ExtraSysTablePrefixes"
+
+#define INI_TRANSLATIONNAME				"TranslationName"
+#define INI_TRANSLATIONDLL				"TranslationDLL"
+#define INI_TRANSLATIONOPTION			"TranslationOption"
 
 
 /*	Connection Defaults */

drvconn.c

@@ -1,4 +1,3 @@
-
 /* Module:			drvconn.c
  *
  * Description:		This module contains only routines related to

environ.c

@@ -1,4 +1,3 @@
-
 /* Module:			environ.c
  *
  * Description:		This module contains routines related to

environ.h

@@ -1,4 +1,3 @@
-
 /* File:			environ.h
  *
  * Description:		See "environ.c"

execute.c

@@ -1,4 +1,3 @@
-
 /* Module:			execute.c
  *
  * Description:		This module contains routines related to