Reverted changes made by pgindent

Made show.pgc set all variables before displaying them.

1 files changed, 76 insertions, 121 deletions

diff --git a/src/interfaces/ecpg/test/expected/sql-array.c b/src/interfaces/ecpg/test/expected/sql-array.c
index 8b7dec49e79..87ec88f985a 100644
--- a/src/interfaces/ecpg/test/expected/sql-array.c
+++ b/src/interfaces/ecpg/test/expected/sql-array.c
@@ -81,6 +81,7 @@ struct sqlca_t *ECPGget_sqlca(void);
 #ifdef __cplusplus
 }
 #endif
+
 #endif
 
 #line 7 "array.pgc"
@@ -97,34 +98,33 @@ struct sqlca_t *ECPGget_sqlca(void);
 
 
 int
-main(void)
+main (void)
 {
 /* exec sql begin declare section */
-
-
-
-
-
-
+	   
+	   
+	   
+	   
+	    
+	 
 
 #line 14 "array.pgc"
-	int			i = 1;
-
+ int  i   = 1 ;
+ 
 #line 15 "array.pgc"
-	int		   *did = &i;
-
+ int * did   = & i ;
+ 
 #line 16 "array.pgc"
-	int			a[10] = {9, 8, 7, 6, 5, 4, 3, 2, 1, 0};
-
+ int  a [ 10 ]   = { 9 , 8 , 7 , 6 , 5 , 4 , 3 , 2 , 1 , 0 } ;
+ 
 #line 17 "array.pgc"
-	char text	[25] = "klmnopqrst";
-
+ char  text [ 25 ]   = "klmnopqrst" ;
+ 
 #line 18 "array.pgc"
-	char	   *t = (char *) malloc(11);
-
+ char * t   = ( char * ) malloc ( 11 ) ;
+ 
 #line 19 "array.pgc"
-	double		f;
-
+ double  f    ;
 /* exec sql end declare section */
 #line 20 "array.pgc"
 
@@ -134,136 +134,103 @@ main(void)
 
 	ECPGdebug(1, stderr);
 
-	{
-		ECPGconnect(__LINE__, 0, "regress1", NULL, NULL, NULL, 0);
+        { ECPGconnect(__LINE__, 0, "regress1" , NULL,NULL , NULL, 0); 
 #line 27 "array.pgc"
 
-		if (sqlca.sqlcode < 0)
-			sqlprint();
-	}
+if (sqlca.sqlcode < 0) sqlprint();}
 #line 27 "array.pgc"
 
 
-	{
-		ECPGsetcommit(__LINE__, "on", NULL);
+	{ ECPGsetcommit(__LINE__, "on", NULL);
 #line 29 "array.pgc"
 
-		if (sqlca.sqlcode < 0)
-			sqlprint();
-	}
+if (sqlca.sqlcode < 0) sqlprint();}
 #line 29 "array.pgc"
 
 
-	{
-		ECPGtrans(__LINE__, NULL, "begin transaction ");
+ 	{ ECPGtrans(__LINE__, NULL, "begin transaction ");
 #line 31 "array.pgc"
 
-		if (sqlca.sqlcode < 0)
-			sqlprint();
-	}
+if (sqlca.sqlcode < 0) sqlprint();}
 #line 31 "array.pgc"
 
 
-	{
-		ECPGdo(__LINE__, 0, 1, NULL, "create  table test ( f float    , i int   , a int [ 10 ]   , text char  ( 10 )    )    ", ECPGt_EOIT, ECPGt_EORT);
+	{ ECPGdo(__LINE__, 0, 1, NULL, "create  table test ( f float    , i int   , a int [ 10 ]   , text char  ( 10 )    )    ", ECPGt_EOIT, ECPGt_EORT);
 #line 33 "array.pgc"
 
-		if (sqlca.sqlcode < 0)
-			sqlprint();
-	}
+if (sqlca.sqlcode < 0) sqlprint();}
 #line 33 "array.pgc"
 
 
-	{
-		ECPGdo(__LINE__, 0, 1, NULL, "insert into test ( f  , i  , a  , text  ) values ( 404.90 , 3 , '{0,1,2,3,4,5,6,7,8,9}' , 'abcdefghij' ) ", ECPGt_EOIT, ECPGt_EORT);
+	{ ECPGdo(__LINE__, 0, 1, NULL, "insert into test ( f  , i  , a  , text  ) values ( 404.90 , 3 , '{0,1,2,3,4,5,6,7,8,9}' , 'abcdefghij' ) ", ECPGt_EOIT, ECPGt_EORT);
 #line 35 "array.pgc"
 
-		if (sqlca.sqlcode < 0)
-			sqlprint();
-	}
+if (sqlca.sqlcode < 0) sqlprint();}
 #line 35 "array.pgc"
 
 
-	{
-		ECPGdo(__LINE__, 0, 1, NULL, "insert into test ( f  , i  , a  , text  ) values ( 140787.0 , 2 ,  ? ,  ? ) ",
-			   ECPGt_int, (a), (long) 1, (long) 10, sizeof(int),
-			   ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L,
-			   ECPGt_char, (text), (long) 25, (long) 1, (25) * sizeof(char),
-			   ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT);
+	{ ECPGdo(__LINE__, 0, 1, NULL, "insert into test ( f  , i  , a  , text  ) values ( 140787.0 , 2 ,  ? ,  ? ) ", 
+	ECPGt_int,(a),(long)1,(long)10,sizeof(int), 
+	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, 
+	ECPGt_char,(text),(long)25,(long)1,(25)*sizeof(char), 
+	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT);
 #line 37 "array.pgc"
 
-		if (sqlca.sqlcode < 0)
-			sqlprint();
-	}
+if (sqlca.sqlcode < 0) sqlprint();}
 #line 37 "array.pgc"
 
-
-	{
-		ECPGdo(__LINE__, 0, 1, NULL, "insert into test ( f  , i  , a  , text  ) values ( 14.07 ,  ? ,  ? ,  ? ) ",
-			   ECPGt_int, &(did), (long) 1, (long) 0, sizeof(int),
-			   ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L,
-			   ECPGt_int, (a), (long) 1, (long) 10, sizeof(int),
-			   ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L,
-			   ECPGt_char, &(t), (long) 0, (long) 1, (1) * sizeof(char),
-			   ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT);
+	
+	{ ECPGdo(__LINE__, 0, 1, NULL, "insert into test ( f  , i  , a  , text  ) values ( 14.07 ,  ? ,  ? ,  ? ) ", 
+	ECPGt_int,&(did),(long)1,(long)0,sizeof(int), 
+	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, 
+	ECPGt_int,(a),(long)1,(long)10,sizeof(int), 
+	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, 
+	ECPGt_char,&(t),(long)0,(long)1,(1)*sizeof(char), 
+	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT);
 #line 39 "array.pgc"
 
-		if (sqlca.sqlcode < 0)
-			sqlprint();
-	}
+if (sqlca.sqlcode < 0) sqlprint();}
 #line 39 "array.pgc"
 
 
-	{
-		ECPGtrans(__LINE__, NULL, "commit");
+	{ ECPGtrans(__LINE__, NULL, "commit");
 #line 41 "array.pgc"
 
-		if (sqlca.sqlcode < 0)
-			sqlprint();
-	}
+if (sqlca.sqlcode < 0) sqlprint();}
 #line 41 "array.pgc"
 
 
-	{
-		ECPGtrans(__LINE__, NULL, "begin transaction ");
+	{ ECPGtrans(__LINE__, NULL, "begin transaction ");
 #line 43 "array.pgc"
 
-		if (sqlca.sqlcode < 0)
-			sqlprint();
-	}
+if (sqlca.sqlcode < 0) sqlprint();}
 #line 43 "array.pgc"
+ 
 
-
-	{
-		ECPGdo(__LINE__, 0, 1, NULL, "select  f , text  from test where i = 1  ", ECPGt_EOIT,
-			   ECPGt_double, &(f), (long) 1, (long) 1, sizeof(double),
-			   ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L,
-			   ECPGt_char, (text), (long) 25, (long) 1, (25) * sizeof(char),
-			   ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, ECPGt_EORT);
+	{ ECPGdo(__LINE__, 0, 1, NULL, "select  f , text  from test where i = 1  ", ECPGt_EOIT, 
+	ECPGt_double,&(f),(long)1,(long)1,sizeof(double), 
+	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, 
+	ECPGt_char,(text),(long)25,(long)1,(25)*sizeof(char), 
+	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT);
 #line 48 "array.pgc"
 
-		if (sqlca.sqlcode < 0)
-			sqlprint();
-	}
+if (sqlca.sqlcode < 0) sqlprint();}
 #line 48 "array.pgc"
 
 
 	printf("Found f=%f text=%10.10s\n", f, text);
 
-	f = 140787;
-	{
-		ECPGdo(__LINE__, 0, 1, NULL, "select  a , text  from test where f =  ?  ",
-			   ECPGt_double, &(f), (long) 1, (long) 1, sizeof(double),
-			   ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, ECPGt_EOIT,
-			   ECPGt_int, (a), (long) 1, (long) 10, sizeof(int),
-			   ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L,
-			   ECPGt_char, &(t), (long) 0, (long) 1, (1) * sizeof(char),
-			   ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, ECPGt_EORT);
+	f=140787;
+	{ ECPGdo(__LINE__, 0, 1, NULL, "select  a , text  from test where f =  ?  ", 
+	ECPGt_double,&(f),(long)1,(long)1,sizeof(double), 
+	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT, 
+	ECPGt_int,(a),(long)1,(long)10,sizeof(int), 
+	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, 
+	ECPGt_char,&(t),(long)0,(long)1,(1)*sizeof(char), 
+	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT);
 #line 56 "array.pgc"
 
-		if (sqlca.sqlcode < 0)
-			sqlprint();
-	}
+if (sqlca.sqlcode < 0) sqlprint();}
 #line 56 "array.pgc"
 
 
@@ -272,49 +239,37 @@ main(void)
 
 	printf("Found text=%10.10s\n", t);
 
-	{
-		ECPGdo(__LINE__, 0, 1, NULL, "select  a  from test where f =  ?  ",
-			   ECPGt_double, &(f), (long) 1, (long) 1, sizeof(double),
-			   ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, ECPGt_EOIT,
-			   ECPGt_char, (text), (long) 25, (long) 1, (25) * sizeof(char),
-			   ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, ECPGt_EORT);
+	{ ECPGdo(__LINE__, 0, 1, NULL, "select  a  from test where f =  ?  ", 
+	ECPGt_double,&(f),(long)1,(long)1,sizeof(double), 
+	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT, 
+	ECPGt_char,(text),(long)25,(long)1,(25)*sizeof(char), 
+	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT);
 #line 66 "array.pgc"
 
-		if (sqlca.sqlcode < 0)
-			sqlprint();
-	}
+if (sqlca.sqlcode < 0) sqlprint();}
 #line 66 "array.pgc"
 
 
 	printf("Found text=%s\n", text);
 
-	{
-		ECPGdo(__LINE__, 0, 1, NULL, "drop table test ", ECPGt_EOIT, ECPGt_EORT);
+	{ ECPGdo(__LINE__, 0, 1, NULL, "drop table test ", ECPGt_EOIT, ECPGt_EORT);
 #line 70 "array.pgc"
 
-		if (sqlca.sqlcode < 0)
-			sqlprint();
-	}
+if (sqlca.sqlcode < 0) sqlprint();}
 #line 70 "array.pgc"
 
 
-	{
-		ECPGtrans(__LINE__, NULL, "commit");
+	{ ECPGtrans(__LINE__, NULL, "commit");
 #line 72 "array.pgc"
 
-		if (sqlca.sqlcode < 0)
-			sqlprint();
-	}
+if (sqlca.sqlcode < 0) sqlprint();}
 #line 72 "array.pgc"
 
 
-	{
-		ECPGdisconnect(__LINE__, "CURRENT");
+	{ ECPGdisconnect(__LINE__, "CURRENT");
 #line 74 "array.pgc"
 
-		if (sqlca.sqlcode < 0)
-			sqlprint();
-	}
+if (sqlca.sqlcode < 0) sqlprint();}
 #line 74 "array.pgc"