pgindent run for 8.2.

1 files changed, 150 insertions, 90 deletions

diff --git a/src/interfaces/ecpg/test/expected/preproc-variable.c b/src/interfaces/ecpg/test/expected/preproc-variable.c
index 37819927477..83761b1f968 100644
--- a/src/interfaces/ecpg/test/expected/preproc-variable.c
+++ b/src/interfaces/ecpg/test/expected/preproc-variable.c
@@ -25,197 +25,245 @@
 #line 6 "variable.pgc"
 
 
-/* exec sql type c is char  reference */
+/* exec sql type c is char	reference */
 #line 8 "variable.pgc"
 
-typedef char* c;
+typedef char *c;
 
-/* exec sql type ind is union { 
+/* exec sql type ind is union {
 #line 11 "variable.pgc"
- int  integer    ;
- 
+ int  integer	 ;
+
 #line 11 "variable.pgc"
- short  smallint    ;
- }   */
+ short	smallint	;
+ }	 */
 #line 11 "variable.pgc"
 
-typedef union { int integer; short smallint; } ind;
+typedef union
+{
+	int			integer;
+	short		smallint;
+}	ind;
 
 #define BUFFERSIZ 8
-/* exec sql type str is  [ BUFFERSIZ ]   */
+/* exec sql type str is  [ BUFFERSIZ ]	 */
 #line 15 "variable.pgc"
 
 
-/* declare cur  cursor  for select  name , born , age , married , children  from family    */
+/* declare cur	cursor	for select	name , born , age , married , children	from family    */
 #line 18 "variable.pgc"
 
 
 int
-main (void)
+main(void)
 {
-	struct birthinfo { 
+	struct birthinfo
+	{
 #line 23 "variable.pgc"
- long  born    ;
- 
+		long		born;
+
 #line 23 "variable.pgc"
- short  age    ;
- } ;
+		short		age;
+	};
+
 #line 23 "variable.pgc"
 
 /* exec sql begin declare section */
-	 		 
-					  
-				  
-	  	 
-					  
-				    
-	 
+
+
+
+
+
+
+
 
 #line 27 "variable.pgc"
- struct personal_struct { 
+	struct personal_struct
+	{
 #line 25 "variable.pgc"
-   struct varchar_name  { int len; char arr[ BUFFERSIZ ]; }  name    ;
- 
+		struct varchar_name
+		{
+			int			len;
+			char		arr[BUFFERSIZ];
+		}			name;
+
 #line 26 "variable.pgc"
- struct birthinfo  birth    ;
- }  personal    , * p    ;
- 
+		struct birthinfo birth;
+	}			personal, *p;
+
 #line 30 "variable.pgc"
- struct personal_indicator { 
+	struct personal_indicator
+	{
 #line 28 "variable.pgc"
- int  ind_name    ;
- 
+		int			ind_name;
+
 #line 29 "variable.pgc"
- struct birthinfo  ind_birth    ;
- }  ind_personal    , * i    ;
- 
+		struct birthinfo ind_birth;
+	}			ind_personal, *i;
+
 #line 31 "variable.pgc"
- ind  ind_children    ;
+	ind			ind_children;
+
 /* exec sql end declare section */
 #line 32 "variable.pgc"
 
 
-	
+
 #line 34 "variable.pgc"
- char * married   = NULL ;
+	char	   *married = NULL;
 
 #line 34 "variable.pgc"
 
-	
+
 #line 35 "variable.pgc"
- long  ind_married    ;
+	long		ind_married;
 
 #line 35 "variable.pgc"
 
-	
+
 #line 36 "variable.pgc"
- ind  children    ;
+	ind			children;
 
 #line 36 "variable.pgc"
 
 
-	char msg[128];
+	char		msg[128];
 
-        ECPGdebug(1, stderr);
+	ECPGdebug(1, stderr);
 
 	strcpy(msg, "connect");
-	{ ECPGconnect(__LINE__, 0, "regress1" , NULL,NULL , NULL, 0); 
+	{
+		ECPGconnect(__LINE__, 0, "regress1", NULL, NULL, NULL, 0);
 #line 43 "variable.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint();}
+		if (sqlca.sqlcode < 0)
+			sqlprint();
+	}
 #line 43 "variable.pgc"
 
 
 	strcpy(msg, "set");
-	{ ECPGdo(__LINE__, 0, 1, NULL, "set datestyle to iso", ECPGt_EOIT, ECPGt_EORT);
+	{
+		ECPGdo(__LINE__, 0, 1, NULL, "set datestyle to iso", ECPGt_EOIT, ECPGt_EORT);
 #line 46 "variable.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint();}
+		if (sqlca.sqlcode < 0)
+			sqlprint();
+	}
 #line 46 "variable.pgc"
 
 
 	strcpy(msg, "create");
-	{ ECPGdo(__LINE__, 0, 1, NULL, "create  table family ( name char  ( 8 )    , born integer   , age smallint   , married date   , children integer   )    ", ECPGt_EOIT, ECPGt_EORT);
+	{
+		ECPGdo(__LINE__, 0, 1, NULL, "create  table family ( name char  ( 8 )    , born integer   , age smallint   , married date   , children integer   )    ", ECPGt_EOIT, ECPGt_EORT);
 #line 49 "variable.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint();}
+		if (sqlca.sqlcode < 0)
+			sqlprint();
+	}
 #line 49 "variable.pgc"
 
 
 	strcpy(msg, "insert");
-	{ ECPGdo(__LINE__, 0, 1, NULL, "insert into family ( name  , married  , children  ) values ( 'Mum' , '19870714' , 3 ) ", ECPGt_EOIT, ECPGt_EORT);
+	{
+		ECPGdo(__LINE__, 0, 1, NULL, "insert into family ( name  , married  , children  ) values ( 'Mum' , '19870714' , 3 ) ", ECPGt_EOIT, ECPGt_EORT);
 #line 52 "variable.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint();}
+		if (sqlca.sqlcode < 0)
+			sqlprint();
+	}
 #line 52 "variable.pgc"
 
-	{ ECPGdo(__LINE__, 0, 1, NULL, "insert into family ( name  , born  , married  , children  ) values ( 'Dad' , '19610721' , '19870714' , 3 ) ", ECPGt_EOIT, ECPGt_EORT);
+	{
+		ECPGdo(__LINE__, 0, 1, NULL, "insert into family ( name  , born  , married  , children  ) values ( 'Dad' , '19610721' , '19870714' , 3 ) ", ECPGt_EOIT, ECPGt_EORT);
 #line 53 "variable.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint();}
+		if (sqlca.sqlcode < 0)
+			sqlprint();
+	}
 #line 53 "variable.pgc"
 
-	{ ECPGdo(__LINE__, 0, 1, NULL, "insert into family ( name  , age  ) values ( 'Child 1' , 16 ) ", ECPGt_EOIT, ECPGt_EORT);
+	{
+		ECPGdo(__LINE__, 0, 1, NULL, "insert into family ( name  , age  ) values ( 'Child 1' , 16 ) ", ECPGt_EOIT, ECPGt_EORT);
 #line 54 "variable.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint();}
+		if (sqlca.sqlcode < 0)
+			sqlprint();
+	}
 #line 54 "variable.pgc"
 
-	{ ECPGdo(__LINE__, 0, 1, NULL, "insert into family ( name  , age  ) values ( 'Child 2' , 14 ) ", ECPGt_EOIT, ECPGt_EORT);
+	{
+		ECPGdo(__LINE__, 0, 1, NULL, "insert into family ( name  , age  ) values ( 'Child 2' , 14 ) ", ECPGt_EOIT, ECPGt_EORT);
 #line 55 "variable.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint();}
+		if (sqlca.sqlcode < 0)
+			sqlprint();
+	}
 #line 55 "variable.pgc"
 
-	{ ECPGdo(__LINE__, 0, 1, NULL, "insert into family ( name  , age  ) values ( 'Child 3' , 9 ) ", ECPGt_EOIT, ECPGt_EORT);
+	{
+		ECPGdo(__LINE__, 0, 1, NULL, "insert into family ( name  , age  ) values ( 'Child 3' , 9 ) ", ECPGt_EOIT, ECPGt_EORT);
 #line 56 "variable.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint();}
+		if (sqlca.sqlcode < 0)
+			sqlprint();
+	}
 #line 56 "variable.pgc"
 
 
 	strcpy(msg, "commit");
-	{ ECPGtrans(__LINE__, NULL, "commit");
+	{
+		ECPGtrans(__LINE__, NULL, "commit");
 #line 59 "variable.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint();}
+		if (sqlca.sqlcode < 0)
+			sqlprint();
+	}
 #line 59 "variable.pgc"
 
 
 	strcpy(msg, "open");
-	{ ECPGdo(__LINE__, 0, 1, NULL, "declare cur  cursor  for select  name , born , age , married , children  from family   ", ECPGt_EOIT, ECPGt_EORT);
+	{
+		ECPGdo(__LINE__, 0, 1, NULL, "declare cur  cursor  for select  name , born , age , married , children  from family   ", ECPGt_EOIT, ECPGt_EORT);
 #line 62 "variable.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint();}
+		if (sqlca.sqlcode < 0)
+			sqlprint();
+	}
 #line 62 "variable.pgc"
 
 
-	/* exec sql whenever not found  break ; */
+	/* exec sql whenever not found	break ; */
 #line 64 "variable.pgc"
 
 
-	p=&personal;
-	i=&ind_personal;
+	p = &personal;
+	i = &ind_personal;
 	memset(i, 0, sizeof(ind_personal));
-	while (1) {
+	while (1)
+	{
 		strcpy(msg, "fetch");
-		{ ECPGdo(__LINE__, 0, 1, NULL, "fetch cur", ECPGt_EOIT, 
-	ECPGt_varchar,&(p->name),(long)BUFFERSIZ,(long)1,sizeof(struct varchar_name), 
-	ECPGt_int,&(i->ind_name),(long)1,(long)1,sizeof(int), 
-	ECPGt_long,&(p->birth.born),(long)1,(long)1,sizeof(long), 
-	ECPGt_long,&(i->ind_birth.born),(long)1,(long)1,sizeof(long), 
-	ECPGt_short,&(p->birth.age),(long)1,(long)1,sizeof(short), 
-	ECPGt_short,&(i->ind_birth.age),(long)1,(long)1,sizeof(short), 
-	ECPGt_char,&(married),(long)0,(long)1,(1)*sizeof(char), 
-	ECPGt_long,&(ind_married),(long)1,(long)1,sizeof(long), 
-	ECPGt_int,&(children.integer),(long)1,(long)1,sizeof(int), 
-	ECPGt_short,&(ind_children.smallint),(long)1,(long)1,sizeof(short), ECPGt_EORT);
+		{
+			ECPGdo(__LINE__, 0, 1, NULL, "fetch cur", ECPGt_EOIT,
+				   ECPGt_varchar, &(p->name), (long) BUFFERSIZ, (long) 1, sizeof(struct varchar_name),
+				   ECPGt_int, &(i->ind_name), (long) 1, (long) 1, sizeof(int),
+			  ECPGt_long, &(p->birth.born), (long) 1, (long) 1, sizeof(long),
+				   ECPGt_long, &(i->ind_birth.born), (long) 1, (long) 1, sizeof(long),
+			 ECPGt_short, &(p->birth.age), (long) 1, (long) 1, sizeof(short),
+				   ECPGt_short, &(i->ind_birth.age), (long) 1, (long) 1, sizeof(short),
+			  ECPGt_char, &(married), (long) 0, (long) 1, (1) * sizeof(char),
+				ECPGt_long, &(ind_married), (long) 1, (long) 1, sizeof(long),
+			 ECPGt_int, &(children.integer), (long) 1, (long) 1, sizeof(int),
+				   ECPGt_short, &(ind_children.smallint), (long) 1, (long) 1, sizeof(short), ECPGt_EORT);
 #line 71 "variable.pgc"
 
-if (sqlca.sqlcode == ECPG_NOT_FOUND) break;
+			if (sqlca.sqlcode == ECPG_NOT_FOUND)
+				break;
 #line 71 "variable.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint();}
+			if (sqlca.sqlcode < 0)
+				sqlprint();
+		}
 #line 71 "variable.pgc"
 
 		printf("%8.8s", personal.name.arr);
@@ -234,34 +282,46 @@ if (sqlca.sqlcode < 0) sqlprint();}
 	}
 
 	strcpy(msg, "close");
-	{ ECPGdo(__LINE__, 0, 1, NULL, "close cur", ECPGt_EOIT, ECPGt_EORT);
+	{
+		ECPGdo(__LINE__, 0, 1, NULL, "close cur", ECPGt_EOIT, ECPGt_EORT);
 #line 88 "variable.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint();}
+		if (sqlca.sqlcode < 0)
+			sqlprint();
+	}
 #line 88 "variable.pgc"
 
 
 	strcpy(msg, "drop");
-	{ ECPGdo(__LINE__, 0, 1, NULL, "drop table family ", ECPGt_EOIT, ECPGt_EORT);
+	{
+		ECPGdo(__LINE__, 0, 1, NULL, "drop table family ", ECPGt_EOIT, ECPGt_EORT);
 #line 91 "variable.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint();}
+		if (sqlca.sqlcode < 0)
+			sqlprint();
+	}
 #line 91 "variable.pgc"
 
 
 	strcpy(msg, "commit");
-	{ ECPGtrans(__LINE__, NULL, "commit");
+	{
+		ECPGtrans(__LINE__, NULL, "commit");
 #line 94 "variable.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint();}
+		if (sqlca.sqlcode < 0)
+			sqlprint();
+	}
 #line 94 "variable.pgc"
 
 
-	strcpy(msg, "disconnect"); 
-	{ ECPGdisconnect(__LINE__, "CURRENT");
+	strcpy(msg, "disconnect");
+	{
+		ECPGdisconnect(__LINE__, "CURRENT");
 #line 97 "variable.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint();}
+		if (sqlca.sqlcode < 0)
+			sqlprint();
+	}
 #line 97 "variable.pgc"