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

src/interfaces/odbc/bind.c

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

src/interfaces/odbc/bind.h

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

src/interfaces/odbc/columninfo.c

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

src/interfaces/odbc/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

src/interfaces/odbc/connection.c

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

src/interfaces/odbc/connection.h

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

src/interfaces/odbc/convert.c

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

src/interfaces/odbc/convert.h

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

src/interfaces/odbc/dlg_specific.c

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

src/interfaces/odbc/dlg_specific.h

@@ -1,4 +1,3 @@
-
 /* File:			dlg_specific.h
  *
  * Description:		See "dlg_specific.c"
@@ -38,18 +37,23 @@
 #define ODBCINST_INI					"/etc/odbcinst.ini"
 #endif
 #else							/* WIN32 */
-#define ODBC_INI		"ODBC.INI"		/* ODBC initialization file */
+#define ODBC_INI						"ODBC.INI"		/* ODBC initialization
-#define ODBCINST_INI	"ODBCINST.INI"	/* ODBC Installation file */
+														 * 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
-										 * ini file (not used?) */
+														 * Datasource in ini
-#define INI_KDESC		  "Description" /* Data source description */
+														 * file (not used?) */
-#define INI_SERVER		  "Servername"	/* Name of Server running the
+#define INI_KDESC						"Description"	/* Data source
-										 * Postgres service */
+														 * description */
-#define INI_PORT		  "Port"/* Port on which the Postmaster is
+#define INI_SERVER						"Servername"	/* Name of Server
-								 * listening */
+														 * 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 */
@@ -57,15 +61,18 @@
 #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_COMMLOG						"CommLog"		/* Communication to
-										 * logging */
+														 * backend logging */
 #define INI_PROTOCOL					"Protocol"		/* What protocol (6.2) */
-#define INI_OPTIMIZER	  "Optimizer"	/* Use backend genetic optimizer */
+#define INI_OPTIMIZER					"Optimizer"		/* Use backend genetic
-#define INI_KSQO		  "Ksqo"/* Keyset query optimization */
+														 * 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_UNIQUEINDEX					"UniqueIndex"	/* Recognize unique
+														 * indexes */
 #define INI_UNKNOWNSIZES				"UnknownSizes"	/* How to handle unknown
 														 * result set sizes */
 

src/interfaces/odbc/drvconn.c

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

src/interfaces/odbc/environ.c

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

src/interfaces/odbc/environ.h

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

src/interfaces/odbc/execute.c

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

src/interfaces/odbc/gpps.c

@@ -1,14 +1,21 @@
-/* GetPrivateProfileString() -- approximate implementation of */
+/* GetPrivateProfileString()
-/* Windows NT System Services version of GetPrivateProfileString() */
+ *
-/* probably doesn't handle the NULL key for section name or value key */
+ * approximate implementation of
-/* correctly also, doesn't provide Microsoft backwards compatability */
+ * Windows NT System Services version of GetPrivateProfileString()
-/* wrt TAB characters in the value string -- Microsoft terminates value */
+ * probably doesn't handle the NULL key for section name or value key
-/* at the first TAB, but I couldn't discover what the behavior should */
+ * correctly also, doesn't provide Microsoft backwards compatability
-/* be regarding TABS in quoted strings so, I treat tabs like any other */
+ * wrt TAB characters in the value string
-/* characters -- NO comments following value string separated by a TAB */
+ *
-/* are allowed (that is an anachronism anyway) */
+ * Microsoft terminates value
-/* Added code to search for ODBC_INI file in users home directory on */
+ * at the first TAB, but I couldn't discover what the behavior should
-/* Unix */
+ * be regarding TABS in quoted strings so, I treat tabs like any other
+ * characters
+ *
+ * NO comments following value string separated by a TAB
+ * are allowed (that is an anachronism anyway)
+ * Added code to search for ODBC_INI file in users home directory on
+ * Unix
+ */
 
 #ifndef WIN32
 

src/interfaces/odbc/gpps.h

@@ -1,5 +1,6 @@
-/* GetPrivateProfileString */
+/* GetPrivateProfileString
-/* for UNIX use */
+ * for UNIX use
+ */
 #ifndef GPPS_H
 #define GPPS_H
 

src/interfaces/odbc/info.c

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

src/interfaces/odbc/isql.h

@@ -1,6 +1,8 @@
-/* Modified isql.h file from iodbc. This file should be placed in the
+/*
+ * Modified isql.h file from iodbc. This file should be placed in the
  * include path to be used to create ODBC compliant applications.
  */
+
 #ifndef _INTRINSIC_SQL_H
 #define _INTRINSIC_SQL_H
 

src/interfaces/odbc/isqlext.h

@@ -1,7 +1,9 @@
-/* This file has been modified from the original isqlext.h to add the
+/*
+ * This file has been modified from the original isqlext.h to add the
  * missing function prototypes and appropriate #defines. It is designed
  * to be a drop in replacement for isqlext.h from iodbc.
  */
+
 #ifndef _INTRINSIC_SQLEXT_H
 #define _INTRINSIC_SQLEXT_H
 
@@ -1275,7 +1277,8 @@ typedef struct tagSQL_INTERVAL_STRUCT
  */
 #define SQL_UB_OFF						0UL
 #define SQL_UB_ON						1UL
-#define SQL_UB_FIXED		SQL_UB_ON	/* Deprecated in ODBC 3.0 */
+#define SQL_UB_FIXED					SQL_UB_ON		/* Deprecated in ODBC
+														 * 3.0 */
 #define SQL_UB_VARIABLE					2UL		/* Added in ODBC 3.0 */
 #define SQL_UB_DEFAULT					SQL_UB_OFF
 

src/interfaces/odbc/lobj.c

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

src/interfaces/odbc/lobj.h

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

src/interfaces/odbc/misc.c

@@ -1,4 +1,3 @@
-
 /* Module:			misc.c
  *
  * Description:		This module contains miscellaneous routines

src/interfaces/odbc/misc.h

@@ -1,4 +1,3 @@
-
 /* File:			misc.h
  *
  * Description:		See "misc.c"
@@ -98,8 +97,8 @@ char	   *my_strcat(char *buf, char *fmt, char *s, int len);
 /* defines for return value of my_strcpy */
 #define STRCPY_SUCCESS		1
 #define STRCPY_FAIL			0
-#define STRCPY_TRUNCATED	-1
+#define STRCPY_TRUNCATED	(-1)
-#define STRCPY_NULL			-2
+#define STRCPY_NULL			(-2)
 
 int			my_strcpy(char *dst, int dst_len, char *src, int src_len);
 

src/interfaces/odbc/multibyte.c

@@ -6,6 +6,7 @@
  *					Create 2001-03-03 Eiji Tokuya
  *
  */
+
 #include <string.h>
 #include "multibyte.h"
 

src/interfaces/odbc/multibyte.h

@@ -2,7 +2,6 @@
  *
  * Multibyte library header ( psqlODBC Only )
  *
- *
  */
 
 /* PostgreSQL client encoding */

src/interfaces/odbc/options.c

@@ -1,4 +1,3 @@
-
 /* Module:			options.c
  *
  * Description:		This module contains routines for getting/setting

src/interfaces/odbc/parse.c

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

src/interfaces/odbc/pgtypes.c

@@ -1,4 +1,3 @@
-
 /* Module:			pgtypes.c
  *
  * Description:		This module contains routines for getting information

src/interfaces/odbc/pgtypes.h

@@ -1,4 +1,3 @@
-
 /* File:			pgtypes.h
  *
  * Description:		See "pgtypes.c"
@@ -67,7 +66,7 @@
 extern Int2 sqlTypes[];
 
 /*	Defines for pgtype_precision */
-#define PG_STATIC		-1
+#define PG_STATIC				(-1)
 
 Int4		sqltype_to_pgtype(Int2 fSqlType);
 

src/interfaces/odbc/psqlodbc.c

@@ -1,4 +1,3 @@
-
 /* Module:			psqlodbc.c
  *
  * Description:		This module contains the main entry point (DllMain) for the library.

src/interfaces/odbc/psqlodbc.h

@@ -1,4 +1,3 @@
-
 /* File:			psqlodbc.h
  *
  * Description:		This file contains defines and declarations that are related to
@@ -6,7 +5,8 @@
  *
  * Comments:		See "notice.txt" for copyright and license information.
  *
- * $Id: psqlodbc.h,v 1.40 2001/03/22 04:01:35 momjian Exp $
+ * $Id: psqlodbc.h,v 1.41 2001/03/27 04:00:54 momjian Exp $
+ *
  */
 
 #ifndef __PSQLODBC_H__
@@ -91,18 +91,19 @@ typedef UInt4 Oid;
 #define MAX_KEYPARTS				20
 #define MAX_KEYLEN					512 /* max key of the form
 										 * "date+outlet+invoice" */
-#define MAX_ROW_SIZE		0	/* Unlimited rowsize with the Tuple
+#define MAX_ROW_SIZE				0	/* Unlimited rowsize with the
-								 * Toaster */
+										 * Tuple Toaster */
-#define MAX_STATEMENT_LEN	0	/* Unlimited statement size with 7.0 */
+#define MAX_STATEMENT_LEN			0	/* Unlimited statement size with
+										 * 7.0 */
 
 /* Previously, numerous query strings were defined of length MAX_STATEMENT_LEN */
 /* Now that's 0, lets use this instead. DJP 24-1-2001 */
 #define STD_STATEMENT_LEN			MAX_MESSAGE_LEN
 
-#define PG62	"6.2"			/* "Protocol" key setting to force
+#define PG62						"6.2"		/* "Protocol" key setting
-								 * Postgres 6.2 */
+												 * to force Postgres 6.2 */
-#define PG63	"6.3"			/* "Protocol" key setting to force
+#define PG63						"6.3"		/* "Protocol" key setting
-								 * postgres 6.3 */
+												 * to force postgres 6.3 */
 #define PG64						"6.4"
 
 typedef struct ConnectionClass_ ConnectionClass;
@@ -173,15 +174,16 @@ typedef struct QueryInfo_
 } QueryInfo;
 
 
-#define PG_TYPE_LO				-999	/* hack until permanent type
+#define PG_TYPE_LO					(-999)		/* hack until permanent
-										 * available */
+												 * type available */
 #define PG_TYPE_LO_NAME				"lo"
-#define OID_ATTNUM				-2		/* the attnum in pg_index of the
+#define OID_ATTNUM					(-2)		/* the attnum in pg_index
-										 * oid */
+												 * of the oid */
 
 /* sizes */
-#define TEXT_FIELD_SIZE			8190	/* size of text fields (not
+#define TEXT_FIELD_SIZE				8190		/* size of text fields
-										 * including null term) */
+												 * (not including null
+												 * term) */
 #define NAME_FIELD_SIZE				32	/* size of name fields */
 #define MAX_VARCHAR_SIZE			254 /* maximum size of a varchar (not
 										 * including null term) */

src/interfaces/odbc/qresult.c

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

src/interfaces/odbc/qresult.h

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

src/interfaces/odbc/results.c

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

src/interfaces/odbc/setup.c

@@ -1,4 +1,3 @@
-
 /* Module:			setup.c
  *
  * Description:		This module contains the setup functions for
@@ -11,7 +10,7 @@
  *
  * Comments:		See "notice.txt" for copyright and license information.
  *
- *************************************************************************************/
+ */
 
 #include  "psqlodbc.h"
 #include  "connection.h"

src/interfaces/odbc/socket.c

@@ -1,4 +1,3 @@
-
 /* Module:			socket.c
  *
  * Description:		This module contains functions for low level socket

src/interfaces/odbc/socket.h

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

src/interfaces/odbc/statement.c

@@ -1,4 +1,3 @@
-
 /* Module:			statement.c
  *
  * Description:		This module contains functions related to creating

src/interfaces/odbc/statement.h

@@ -1,4 +1,3 @@
-
 /* File:			statement.h
  *
  * Description:		See "statement.c"
@@ -50,11 +49,13 @@ typedef enum
 	STMT_EXECUTING				/* statement execution is still going on */
 } STMT_Status;
 
-#define STMT_TRUNCATED -2
+#define STMT_TRUNCATED							(-2)
-#define STMT_INFO_ONLY -1		/* not an error message, just a
+#define STMT_INFO_ONLY							(-1)	/* not an error message,
-								 * notification to be returned by SQLError */
+														 * just a notification
-#define STMT_OK 0				/* will be interpreted as "no error
+														 * to be returned by
-								 * pending" */
+														 * SQLError */
+#define STMT_OK									0		/* will be interpreted
+														 * as "no error pending" */
 #define STMT_EXEC_ERROR							1
 #define STMT_STATUS_ERROR						2
 #define STMT_SEQUENCE_ERROR						3

src/interfaces/odbc/tuple.c

@@ -1,4 +1,3 @@
-
 /* Module:			tuple.c
  *
  * Description:		This module contains functions for setting the data for individual

src/interfaces/odbc/tuple.h

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

src/interfaces/odbc/tuplelist.c

@@ -1,4 +1,3 @@
-
 /* Module:			tuplelist.c
  *
  * Description:		This module contains functions for creating a manual result set

src/interfaces/odbc/tuplelist.h

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