Run pgindent over ODBC source. We couldn't do this years ago because we

weren't the master source.  We are now, and it really needs it.

Author: bmomjian

src/interfaces/odbc/bind.c

@@ -1,9 +1,9 @@
 
-/* File:            bind.h
+/* File:			bind.h
  *
- * Description:     See "bind.c"
+ * Description:		See "bind.c"
  *
- * Comments:        See "notice.txt" for copyright and license information.
+ * Comments:		See "notice.txt" for copyright and license information.
  *
  */
 
@@ -15,33 +15,40 @@
 /*
  * BindInfoClass -- stores information about a bound column
  */
-struct BindInfoClass_ {
-	Int4 buflen;		/* size of buffer */
-	Int4 data_left;		/* amount of data left to read (SQLGetData) */
-	char *buffer;		/* pointer to the buffer */
-	Int4 *used;			/* used space in the buffer (for strings not counting the '\0') */
-	Int2 returntype;	/* kind of conversion to be applied when returning (SQL_C_DEFAULT, SQL_C_CHAR...) */
+struct BindInfoClass_
+{
+	Int4		buflen;			/* size of buffer */
+	Int4		data_left;		/* amount of data left to read
+								 * (SQLGetData) */
+	char	   *buffer;			/* pointer to the buffer */
+	Int4	   *used;			/* used space in the buffer (for strings
+								 * not counting the '\0') */
+	Int2		returntype;		/* kind of conversion to be applied when
+								 * returning (SQL_C_DEFAULT,
+								 * SQL_C_CHAR...) */
 };
 
 /*
  * ParameterInfoClass -- stores information about a bound parameter
  */
-struct ParameterInfoClass_ {
-	Int4 buflen;
-	char *buffer;
-	Int4 *used;
-	Int2 paramType;
-	Int2 CType;
-	Int2 SQLType;
-	UInt4 precision;
-	Int2 scale;
-	Oid  lobj_oid;
-	Int4 *EXEC_used;		/* amount of data OR the oid of the large object */
-	char *EXEC_buffer;		/* the data or the FD of the large object */
-	char data_at_exec;
+struct ParameterInfoClass_
+{
+	Int4		buflen;
+	char	   *buffer;
+	Int4	   *used;
+	Int2		paramType;
+	Int2		CType;
+	Int2		SQLType;
+	UInt4		precision;
+	Int2		scale;
+	Oid			lobj_oid;
+	Int4	   *EXEC_used;		/* amount of data OR the oid of the large
+								 * object */
+	char	   *EXEC_buffer;	/* the data or the FD of the large object */
+	char		data_at_exec;
 };
 
 BindInfoClass *create_empty_bindings(int num_columns);
-void extend_bindings(StatementClass *stmt, int num_columns);
+void		extend_bindings(StatementClass * stmt, int num_columns);
 
 #endif

src/interfaces/odbc/bind.h

@@ -1,13 +1,13 @@
-/* Module:          columninfo.c
+/* Module:			columninfo.c
  *
- * Description:     This module contains routines related to 
- *                  reading and storing the field information from a query.
+ * Description:		This module contains routines related to
+ *					reading and storing the field information from a query.
  *
- * Classes:         ColumnInfoClass (Functions prefix: "CI_")
+ * Classes:			ColumnInfoClass (Functions prefix: "CI_")
  *
- * API functions:   none
+ * API functions:	none
  *
- * Comments:        See "notice.txt" for copyright and license information.
+ * Comments:		See "notice.txt" for copyright and license information.
  *
  */
 
@@ -20,11 +20,12 @@
 ColumnInfoClass *
 CI_Constructor()
 {
-ColumnInfoClass *rv;
+	ColumnInfoClass *rv;
 
 	rv = (ColumnInfoClass *) malloc(sizeof(ColumnInfoClass));
 
-	if (rv) {
+	if (rv)
+	{
 		rv->num_fields = 0;
 		rv->name = NULL;
 		rv->adtid = NULL;
@@ -37,28 +38,28 @@ ColumnInfoClass *rv;
 }
 
 void
-CI_Destructor(ColumnInfoClass *self)
+CI_Destructor(ColumnInfoClass * self)
 {
 	CI_free_memory(self);
 
 	free(self);
 }
 
-/*  Read in field descriptions.
-    If self is not null, then also store the information.
+/*	Read in field descriptions.
+	If self is not null, then also store the information.
 	If self is null, then just read, don't store.
 */
 char
-CI_read_fields(ColumnInfoClass *self, ConnectionClass *conn)
+CI_read_fields(ColumnInfoClass * self, ConnectionClass * conn)
 {
-Int2 lf;
-int new_num_fields;
-Oid new_adtid;
-Int2 new_adtsize;
-Int4 new_atttypmod = -1;
-char new_field_name[MAX_MESSAGE_LEN+1];
-SocketClass *sock;
-ConnInfo *ci;
+	Int2		lf;
+	int			new_num_fields;
+	Oid			new_adtid;
+	Int2		new_adtsize;
+	Int4		new_atttypmod = -1;
+	char		new_field_name[MAX_MESSAGE_LEN + 1];
+	SocketClass *sock;
+	ConnInfo   *ci;
 
 	sock = CC_get_socket(conn);
 	ci = &conn->connInfo;
@@ -68,24 +69,27 @@ ConnInfo *ci;
 
 	mylog("num_fields = %d\n", new_num_fields);
 
-	if (self) { 	/* according to that allocate memory */
+	if (self)
+	{							/* according to that allocate memory */
 		CI_set_num_fields(self, new_num_fields);
 	}
 
 	/* now read in the descriptions */
-	for(lf = 0; lf < new_num_fields; lf++) {
+	for (lf = 0; lf < new_num_fields; lf++)
+	{
 
 		SOCK_get_string(sock, new_field_name, MAX_MESSAGE_LEN);
 		new_adtid = (Oid) SOCK_get_int(sock, 4);
 		new_adtsize = (Int2) SOCK_get_int(sock, 2);
 
-		/*	If 6.4 protocol, then read the atttypmod field */
-		if (PG_VERSION_GE(conn, 6.4)) {
+		/* If 6.4 protocol, then read the atttypmod field */
+		if (PG_VERSION_GE(conn, 6.4))
+		{
 
 			mylog("READING ATTTYPMOD\n");
 			new_atttypmod = (Int4) SOCK_get_int(sock, 4);
 
-			/*	Subtract the header length */
+			/* Subtract the header length */
 			new_atttypmod -= 4;
 			if (new_atttypmod < 0)
 				new_atttypmod = -1;
@@ -104,17 +108,18 @@ ConnInfo *ci;
 
 
 void
-CI_free_memory(ColumnInfoClass *self)
+CI_free_memory(ColumnInfoClass * self)
 {
-register Int2 lf;
-int num_fields = self->num_fields;
+	register Int2 lf;
+	int			num_fields = self->num_fields;
 
-	for (lf = 0; lf < num_fields; lf++) {
-		if( self->name[lf])
-			free (self->name[lf]);
+	for (lf = 0; lf < num_fields; lf++)
+	{
+		if (self->name[lf])
+			free(self->name[lf]);
 	}
 
-	/*	Safe to call even if null */
+	/* Safe to call even if null */
 	free(self->name);
 	free(self->adtid);
 	free(self->adtsize);
@@ -124,35 +129,33 @@ int num_fields = self->num_fields;
 }
 
 void
-CI_set_num_fields(ColumnInfoClass *self, int new_num_fields)
+CI_set_num_fields(ColumnInfoClass * self, int new_num_fields)
 {
-	CI_free_memory(self);	/* always safe to call */
+	CI_free_memory(self);		/* always safe to call */
 
 	self->num_fields = new_num_fields;
 
-	self->name = (char **) malloc (sizeof(char *) * self->num_fields);
-	self->adtid = (Oid *) malloc (sizeof(Oid) * self->num_fields);
-	self->adtsize = (Int2 *) malloc (sizeof(Int2) * self->num_fields);
+	self->name = (char **) malloc(sizeof(char *) * self->num_fields);
+	self->adtid = (Oid *) malloc(sizeof(Oid) * self->num_fields);
+	self->adtsize = (Int2 *) malloc(sizeof(Int2) * self->num_fields);
 	self->display_size = (Int2 *) malloc(sizeof(Int2) * self->num_fields);
 	self->atttypmod = (Int4 *) malloc(sizeof(Int4) * self->num_fields);
 }
 
 void
-CI_set_field_info(ColumnInfoClass *self, int field_num, char *new_name, 
-                                      Oid new_adtid, Int2 new_adtsize, Int4 new_atttypmod)
+CI_set_field_info(ColumnInfoClass * self, int field_num, char *new_name,
+				  Oid new_adtid, Int2 new_adtsize, Int4 new_atttypmod)
 {
-    
+
 	/* check bounds */
-	if((field_num < 0) || (field_num >= self->num_fields)) {
+	if ((field_num < 0) || (field_num >= self->num_fields))
 		return;
-	}
 
 	/* store the info */
-	self->name[field_num] = strdup(new_name);  
+	self->name[field_num] = strdup(new_name);
 	self->adtid[field_num] = new_adtid;
 	self->adtsize[field_num] = new_adtsize;
 	self->atttypmod[field_num] = new_atttypmod;
 
 	self->display_size[field_num] = 0;
 }
-

src/interfaces/odbc/columninfo.c

@@ -1,9 +1,9 @@
 
-/* File:            columninfo.h
+/* File:			columninfo.h
  *
- * Description:     See "columninfo.c"
+ * Description:		See "columninfo.c"
  *
- * Comments:        See "notice.txt" for copyright and license information.
+ * Comments:		See "notice.txt" for copyright and license information.
  *
  */
 
@@ -12,13 +12,14 @@
 
 #include "psqlodbc.h"
 
-struct ColumnInfoClass_ {
-	Int2	num_fields;
-	char	**name;				/* list of type names */
-	Oid		*adtid;				/* list of type ids */
-	Int2	*adtsize;			/* list type sizes */
-	Int2	*display_size;		/* the display size (longest row) */
-	Int4	*atttypmod;			/* the length of bpchar/varchar */
+struct ColumnInfoClass_
+{
+	Int2		num_fields;
+	char	  **name;			/* list of type names */
+	Oid		   *adtid;			/* list of type ids */
+	Int2	   *adtsize;		/* list type sizes */
+	Int2	   *display_size;	/* the display size (longest row) */
+	Int4	   *atttypmod;		/* the length of bpchar/varchar */
 };
 
 #define CI_get_num_fields(self)			(self->num_fields)
@@ -29,15 +30,15 @@ struct ColumnInfoClass_ {
 #define CI_get_atttypmod(self, col)		(self->atttypmod[col])
 
 ColumnInfoClass *CI_Constructor(void);
-void CI_Destructor(ColumnInfoClass *self);
-void CI_free_memory(ColumnInfoClass *self);
-char CI_read_fields(ColumnInfoClass *self, ConnectionClass *conn);
+void		CI_Destructor(ColumnInfoClass * self);
+void		CI_free_memory(ColumnInfoClass * self);
+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_field_info(ColumnInfoClass *self, int field_num, char *new_name, 
-                       Oid new_adtid, Int2 new_adtsize, Int4 atttypmod);
+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