pgindent run for 8.2.

1 files changed, 145 insertions, 78 deletions

diff --git a/src/interfaces/ecpg/test/expected/preproc-whenever.c b/src/interfaces/ecpg/test/expected/preproc-whenever.c
index 79983ce2f3..270287624d 100644
--- a/src/interfaces/ecpg/test/expected/preproc-whenever.c
+++ b/src/interfaces/ecpg/test/expected/preproc-whenever.c
@@ -24,221 +24,288 @@
 #line 5 "whenever.pgc"
 
 
-static void print(char *msg)
+static void
+print(char *msg)
 {
-        fprintf(stderr, "Error in statement '%s':\n", msg);
-        sqlprint();
+	fprintf(stderr, "Error in statement '%s':\n", msg);
+	sqlprint();
 }
 
-static void print2(void)
+static void
+print2(void)
 {
-        fprintf(stderr, "Found another error\n");
-        sqlprint();
+	fprintf(stderr, "Found another error\n");
+	sqlprint();
 }
 
-static void warn(void)
+static void
+warn(void)
 {
-        fprintf(stderr, "Warning: At least one column was truncated\n");
+	fprintf(stderr, "Warning: At least one column was truncated\n");
 }
 
-int main(void)
+int
+main(void)
 {
-	
+
 #line 26 "whenever.pgc"
- int  i    ;
+	int			i;
 
 #line 26 "whenever.pgc"
 
-	
+
 #line 27 "whenever.pgc"
- char  c [ 6 ]    ;
+	char		c[6];
 
 #line 27 "whenever.pgc"
 
 
 	ECPGdebug(1, stderr);
 
-	{ ECPGconnect(__LINE__, 0, "regress1" , NULL,NULL , NULL, 0); 
+	{
+		ECPGconnect(__LINE__, 0, "regress1", NULL, NULL, NULL, 0);
 #line 31 "whenever.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint();}
+		if (sqlca.sqlcode < 0)
+			sqlprint();
+	}
 #line 31 "whenever.pgc"
 
-	{ ECPGdo(__LINE__, 0, 1, NULL, "create  table test ( i int   , c char  ( 10 )    )    ", ECPGt_EOIT, ECPGt_EORT);
+	{
+		ECPGdo(__LINE__, 0, 1, NULL, "create  table test ( i int   , c char  ( 10 )    )    ", ECPGt_EOIT, ECPGt_EORT);
 #line 32 "whenever.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint();}
+		if (sqlca.sqlcode < 0)
+			sqlprint();
+	}
 #line 32 "whenever.pgc"
 
-	{ ECPGdo(__LINE__, 0, 1, NULL, "insert into test values ( 1 , 'abcdefghij' ) ", ECPGt_EOIT, ECPGt_EORT);
+	{
+		ECPGdo(__LINE__, 0, 1, NULL, "insert into test values ( 1 , 'abcdefghij' ) ", ECPGt_EOIT, ECPGt_EORT);
 #line 33 "whenever.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint();}
+		if (sqlca.sqlcode < 0)
+			sqlprint();
+	}
 #line 33 "whenever.pgc"
 
 
 	/* exec sql whenever sql_warning  do warn (  ) ; */
 #line 35 "whenever.pgc"
 
-	{ ECPGdo(__LINE__, 0, 1, NULL, "select  *  from test   ", ECPGt_EOIT, 
-	ECPGt_int,&(i),(long)1,(long)1,sizeof(int), 
-	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, 
-	ECPGt_char,(c),(long)6,(long)1,(6)*sizeof(char), 
-	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT);
+	{
+		ECPGdo(__LINE__, 0, 1, NULL, "select  *  from test   ", ECPGt_EOIT,
+			   ECPGt_int, &(i), (long) 1, (long) 1, sizeof(int),
+			   ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L,
+			   ECPGt_char, (c), (long) 6, (long) 1, (6) * sizeof(char),
+			   ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, ECPGt_EORT);
 #line 36 "whenever.pgc"
 
-if (sqlca.sqlwarn[0] == 'W') warn (  );
+		if (sqlca.sqlwarn[0] == 'W')
+			warn();
 #line 36 "whenever.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint();}
+		if (sqlca.sqlcode < 0)
+			sqlprint();
+	}
 #line 36 "whenever.pgc"
 
-	{ ECPGtrans(__LINE__, NULL, "rollback");
+	{
+		ECPGtrans(__LINE__, NULL, "rollback");
 #line 37 "whenever.pgc"
 
-if (sqlca.sqlwarn[0] == 'W') warn (  );
+		if (sqlca.sqlwarn[0] == 'W')
+			warn();
 #line 37 "whenever.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint();}
+		if (sqlca.sqlcode < 0)
+			sqlprint();
+	}
 #line 37 "whenever.pgc"
 
 
-	{ ECPGdo(__LINE__, 0, 1, NULL, "select  *  from nonexistant   ", ECPGt_EOIT, 
-	ECPGt_int,&(i),(long)1,(long)1,sizeof(int), 
-	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT);
+	{
+		ECPGdo(__LINE__, 0, 1, NULL, "select  *  from nonexistant   ", ECPGt_EOIT,
+			   ECPGt_int, &(i), (long) 1, (long) 1, sizeof(int),
+			   ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, ECPGt_EORT);
 #line 39 "whenever.pgc"
 
-if (sqlca.sqlwarn[0] == 'W') warn (  );
+		if (sqlca.sqlwarn[0] == 'W')
+			warn();
 #line 39 "whenever.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint();}
+		if (sqlca.sqlcode < 0)
+			sqlprint();
+	}
 #line 39 "whenever.pgc"
 
-	{ ECPGtrans(__LINE__, NULL, "rollback");
+	{
+		ECPGtrans(__LINE__, NULL, "rollback");
 #line 40 "whenever.pgc"
 
-if (sqlca.sqlwarn[0] == 'W') warn (  );
+		if (sqlca.sqlwarn[0] == 'W')
+			warn();
 #line 40 "whenever.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint();}
+		if (sqlca.sqlcode < 0)
+			sqlprint();
+	}
 #line 40 "whenever.pgc"
 
 
 	/* exec sql whenever sqlerror  do print ( \"select\" ) ; */
 #line 42 "whenever.pgc"
 
-	{ ECPGdo(__LINE__, 0, 1, NULL, "select  *  from nonexistant   ", ECPGt_EOIT, 
-	ECPGt_int,&(i),(long)1,(long)1,sizeof(int), 
-	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT);
+	{
+		ECPGdo(__LINE__, 0, 1, NULL, "select  *  from nonexistant   ", ECPGt_EOIT,
+			   ECPGt_int, &(i), (long) 1, (long) 1, sizeof(int),
+			   ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, ECPGt_EORT);
 #line 43 "whenever.pgc"
 
-if (sqlca.sqlwarn[0] == 'W') warn (  );
+		if (sqlca.sqlwarn[0] == 'W')
+			warn();
 #line 43 "whenever.pgc"
 
-if (sqlca.sqlcode < 0) print ( "select" );}
+		if (sqlca.sqlcode < 0)
+			print("select");
+	}
 #line 43 "whenever.pgc"
 
-	{ ECPGtrans(__LINE__, NULL, "rollback");
+	{
+		ECPGtrans(__LINE__, NULL, "rollback");
 #line 44 "whenever.pgc"
 
-if (sqlca.sqlwarn[0] == 'W') warn (  );
+		if (sqlca.sqlwarn[0] == 'W')
+			warn();
 #line 44 "whenever.pgc"
 
-if (sqlca.sqlcode < 0) print ( "select" );}
+		if (sqlca.sqlcode < 0)
+			print("select");
+	}
 #line 44 "whenever.pgc"
 
 
 	/* exec sql whenever sqlerror  call print2 (  ) ; */
 #line 46 "whenever.pgc"
 
-	{ ECPGdo(__LINE__, 0, 1, NULL, "select  *  from nonexistant   ", ECPGt_EOIT, 
-	ECPGt_int,&(i),(long)1,(long)1,sizeof(int), 
-	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT);
+	{
+		ECPGdo(__LINE__, 0, 1, NULL, "select  *  from nonexistant   ", ECPGt_EOIT,
+			   ECPGt_int, &(i), (long) 1, (long) 1, sizeof(int),
+			   ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, ECPGt_EORT);
 #line 47 "whenever.pgc"
 
-if (sqlca.sqlwarn[0] == 'W') warn (  );
+		if (sqlca.sqlwarn[0] == 'W')
+			warn();
 #line 47 "whenever.pgc"
 
-if (sqlca.sqlcode < 0) print2 (  );}
+		if (sqlca.sqlcode < 0)
+			print2();
+	}
 #line 47 "whenever.pgc"
 
-	{ ECPGtrans(__LINE__, NULL, "rollback");
+	{
+		ECPGtrans(__LINE__, NULL, "rollback");
 #line 48 "whenever.pgc"
 
-if (sqlca.sqlwarn[0] == 'W') warn (  );
+		if (sqlca.sqlwarn[0] == 'W')
+			warn();
 #line 48 "whenever.pgc"
 
-if (sqlca.sqlcode < 0) print2 (  );}
+		if (sqlca.sqlcode < 0)
+			print2();
+	}
 #line 48 "whenever.pgc"
 
 
 	/* exec sql whenever sqlerror  continue ; */
 #line 50 "whenever.pgc"
 
-	{ ECPGdo(__LINE__, 0, 1, NULL, "select  *  from nonexistant   ", ECPGt_EOIT, 
-	ECPGt_int,&(i),(long)1,(long)1,sizeof(int), 
-	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT);
+	{
+		ECPGdo(__LINE__, 0, 1, NULL, "select  *  from nonexistant   ", ECPGt_EOIT,
+			   ECPGt_int, &(i), (long) 1, (long) 1, sizeof(int),
+			   ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, ECPGt_EORT);
 #line 51 "whenever.pgc"
 
-if (sqlca.sqlwarn[0] == 'W') warn (  );}
+		if (sqlca.sqlwarn[0] == 'W')
+			warn();
+	}
 #line 51 "whenever.pgc"
 
-	{ ECPGtrans(__LINE__, NULL, "rollback");
+	{
+		ECPGtrans(__LINE__, NULL, "rollback");
 #line 52 "whenever.pgc"
 
-if (sqlca.sqlwarn[0] == 'W') warn (  );}
+		if (sqlca.sqlwarn[0] == 'W')
+			warn();
+	}
 #line 52 "whenever.pgc"
 
 
 	/* exec sql whenever sqlerror  goto  error ; */
 #line 54 "whenever.pgc"
 
-	{ ECPGdo(__LINE__, 0, 1, NULL, "select  *  from nonexistant   ", ECPGt_EOIT, 
-	ECPGt_int,&(i),(long)1,(long)1,sizeof(int), 
-	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT);
+	{
+		ECPGdo(__LINE__, 0, 1, NULL, "select  *  from nonexistant   ", ECPGt_EOIT,
+			   ECPGt_int, &(i), (long) 1, (long) 1, sizeof(int),
+			   ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, ECPGt_EORT);
 #line 55 "whenever.pgc"
 
-if (sqlca.sqlwarn[0] == 'W') warn (  );
+		if (sqlca.sqlwarn[0] == 'W')
+			warn();
 #line 55 "whenever.pgc"
 
-if (sqlca.sqlcode < 0) goto error;}
+		if (sqlca.sqlcode < 0)
+			goto error;
+	}
 #line 55 "whenever.pgc"
 
 	printf("Should not be reachable\n");
 
-	error:
-	{ ECPGtrans(__LINE__, NULL, "rollback");
+error:
+	{
+		ECPGtrans(__LINE__, NULL, "rollback");
 #line 59 "whenever.pgc"
 
-if (sqlca.sqlwarn[0] == 'W') warn (  );
+		if (sqlca.sqlwarn[0] == 'W')
+			warn();
 #line 59 "whenever.pgc"
 
-if (sqlca.sqlcode < 0) goto error;}
+		if (sqlca.sqlcode < 0)
+			goto error;
+	}
 #line 59 "whenever.pgc"
 
 
 	/* exec sql whenever sqlerror  stop ; */
 #line 61 "whenever.pgc"
 
-	{ ECPGdo(__LINE__, 0, 1, NULL, "select  *  from nonexistant   ", ECPGt_EOIT, 
-	ECPGt_int,&(i),(long)1,(long)1,sizeof(int), 
-	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT);
+	{
+		ECPGdo(__LINE__, 0, 1, NULL, "select  *  from nonexistant   ", ECPGt_EOIT,
+			   ECPGt_int, &(i), (long) 1, (long) 1, sizeof(int),
+			   ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, ECPGt_EORT);
 #line 62 "whenever.pgc"
 
-if (sqlca.sqlwarn[0] == 'W') warn (  );
+		if (sqlca.sqlwarn[0] == 'W')
+			warn();
 #line 62 "whenever.pgc"
 
-if (sqlca.sqlcode < 0) exit (1);}
+		if (sqlca.sqlcode < 0)
+			exit(1);
+	}
 #line 62 "whenever.pgc"
 
-	{ ECPGtrans(__LINE__, NULL, "rollback");
+	{
+		ECPGtrans(__LINE__, NULL, "rollback");
 #line 63 "whenever.pgc"
 
-if (sqlca.sqlwarn[0] == 'W') warn (  );
+		if (sqlca.sqlwarn[0] == 'W')
+			warn();
 #line 63 "whenever.pgc"
 
-if (sqlca.sqlcode < 0) exit (1);}
+		if (sqlca.sqlcode < 0)
+			exit(1);
+	}
 #line 63 "whenever.pgc"
 
-	exit (0);
-}	
+	exit(0);
+}