pgindent run on all C files. Java run to follow. initdb/regression

tests pass.

1 files changed, 51 insertions, 51 deletions

diff --git a/src/interfaces/odbc/connection.h b/src/interfaces/odbc/connection.h
index 505325ad682..782fb0e4d15 100644
--- a/src/interfaces/odbc/connection.h
+++ b/src/interfaces/odbc/connection.h
@@ -17,13 +17,14 @@
 
 typedef enum
 {
-	CONN_NOT_CONNECTED,			/* Connection has not been established */
-	CONN_CONNECTED,				/* Connection is up and has been
+				CONN_NOT_CONNECTED,		/* Connection has not been
+										 * established */
+				CONN_CONNECTED, /* Connection is up and has been
 								 * established */
-	CONN_DOWN,					/* Connection is broken */
-	CONN_EXECUTING				/* the connection is currently executing a
+				CONN_DOWN,		/* Connection is broken */
+				CONN_EXECUTING	/* the connection is currently executing a
 								 * statement */
-} CONN_Status;
+}			CONN_Status;
 
 /*	These errors have general sql error state */
 #define CONNECTION_SERVER_NOT_REACHED				101
@@ -151,8 +152,8 @@ typedef struct
 	char		focus_password;
 	char		disallow_premature;
 	char		updatable_cursors;
-	GLOBAL_VALUES	drivers; /* moved from driver's option */
-} ConnInfo;
+	GLOBAL_VALUES drivers;		/* moved from driver's option */
+}			ConnInfo;
 
 /*	Macro to determine is the connection using 6.2 protocol? */
 #define PROTOCOL_62(conninfo_)		(strncmp((conninfo_)->protocol, PG62, strlen(PG62)) == 0)
@@ -212,27 +213,27 @@ struct col_info
 #define HINSTANCE void *
 #endif
 
-typedef BOOL (FAR WINAPI * DataSourceToDriverProc) (UDWORD,
-																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 *);
+typedef BOOL(FAR WINAPI * DataSourceToDriverProc) (UDWORD,
+										   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 *);
 
 /*******	The Connection handle	************/
 struct ConnectionClass_
@@ -267,9 +268,9 @@ struct ConnectionClass_
 	Int2		pg_version_minor;
 	char		ms_jet;
 #ifdef	MULTIBYTE
-	char		*client_encoding;
-	char		*server_encoding;
-#endif /* MULTIBYTE */
+	char	   *client_encoding;
+	char	   *server_encoding;
+#endif	 /* MULTIBYTE */
 };
 
 
@@ -289,24 +290,23 @@ struct ConnectionClass_
 
 /*	prototypes */
 ConnectionClass *CC_Constructor(void);
-char		CC_Destructor(ConnectionClass *self);
-int			CC_cursor_count(ConnectionClass *self);
-char		CC_cleanup(ConnectionClass *self);
-char		CC_abort(ConnectionClass *self);
-int			CC_set_translation(ConnectionClass *self);
-char		CC_connect(ConnectionClass *self, char do_password);
-char		CC_add_statement(ConnectionClass *self, StatementClass *stmt);
-char		CC_remove_statement(ConnectionClass *self, StatementClass *stmt);
-char		CC_get_error(ConnectionClass *self, int *number, char **message);
-QResultClass *CC_send_query(ConnectionClass *self, char *query, QueryInfo *qi);
-void		CC_clear_error(ConnectionClass *self);
-char	   *CC_create_errormsg(ConnectionClass *self);
-int			CC_send_function(ConnectionClass *conn, int fnid, void *result_buf, int *actual_result_len, int result_is_int, LO_ARG *argv, int nargs);
-char		CC_send_settings(ConnectionClass *self);
-void		CC_lookup_lo(ConnectionClass *conn);
-void		CC_lookup_pg_version(ConnectionClass *conn);
-void		CC_initialize_pg_version(ConnectionClass *conn);
-void		CC_log_error(char *func, char *desc, ConnectionClass *self);
-int		CC_get_max_query_len(const  ConnectionClass *self);
-
+char		CC_Destructor(ConnectionClass * self);
+int			CC_cursor_count(ConnectionClass * self);
+char		CC_cleanup(ConnectionClass * self);
+char		CC_abort(ConnectionClass * self);
+int			CC_set_translation(ConnectionClass * self);
+char		CC_connect(ConnectionClass * self, char do_password);
+char		CC_add_statement(ConnectionClass * self, StatementClass * stmt);
+char		CC_remove_statement(ConnectionClass * self, StatementClass * stmt);
+char		CC_get_error(ConnectionClass * self, int *number, char **message);
+QResultClass *CC_send_query(ConnectionClass * self, char *query, QueryInfo * qi);
+void		CC_clear_error(ConnectionClass * self);
+char	   *CC_create_errormsg(ConnectionClass * self);
+int			CC_send_function(ConnectionClass * conn, int fnid, void *result_buf, int *actual_result_len, int result_is_int, LO_ARG * argv, int nargs);
+char		CC_send_settings(ConnectionClass * self);
+void		CC_lookup_lo(ConnectionClass * conn);
+void		CC_lookup_pg_version(ConnectionClass * conn);
+void		CC_initialize_pg_version(ConnectionClass * conn);
+void		CC_log_error(char *func, char *desc, ConnectionClass * self);
+int			CC_get_max_query_len(const ConnectionClass * self);
 #endif