pgindent run for 8.2.

1 files changed, 127 insertions, 75 deletions

diff --git a/src/interfaces/ecpg/test/expected/sql-dynalloc2.c b/src/interfaces/ecpg/test/expected/sql-dynalloc2.c
index 69d9446169a..2f9faf6fa98 100644
--- a/src/interfaces/ecpg/test/expected/sql-dynalloc2.c
+++ b/src/interfaces/ecpg/test/expected/sql-dynalloc2.c
@@ -74,7 +74,6 @@ struct sqlca_t *ECPGget_sqlca(void);
 #ifdef __cplusplus
 }
 #endif
-
 #endif
 
 #line 2 "dynalloc2.pgc"
@@ -91,166 +90,219 @@ struct sqlca_t *ECPGget_sqlca(void);
 #line 4 "dynalloc2.pgc"
 
 
-int main(void)
+int
+main(void)
 {
-   /* exec sql begin declare section */
-    
-    
-    
-    
-    
-   
+	/* exec sql begin declare section */
+
+
+
+
+
+
 #line 9 "dynalloc2.pgc"
- int * ip1   = 0 ;
- 
+	int		   *ip1 = 0;
+
 #line 10 "dynalloc2.pgc"
- char ** cp2   = 0 ;
- 
+	char	  **cp2 = 0;
+
 #line 11 "dynalloc2.pgc"
- int * ipointer1   = 0 ;
- 
+	int		   *ipointer1 = 0;
+
 #line 12 "dynalloc2.pgc"
- int * ipointer2   = 0 ;
- 
+	int		   *ipointer2 = 0;
+
 #line 13 "dynalloc2.pgc"
- int  colnum    ;
+	int			colnum;
+
 /* exec sql end declare section */
 #line 14 "dynalloc2.pgc"
 
-   int i;
+	int			i;
 
-   ECPGdebug(1, stderr);
+	ECPGdebug(1, stderr);
 
-   /* exec sql whenever sqlerror  do sqlprint (  ) ; */
+	/* exec sql whenever sqlerror  do sqlprint (  ) ; */
 #line 19 "dynalloc2.pgc"
 
-   { ECPGconnect(__LINE__, 0, "regress1" , NULL,NULL , NULL, 0); 
+	{
+		ECPGconnect(__LINE__, 0, "regress1", NULL, NULL, NULL, 0);
 #line 20 "dynalloc2.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint (  );}
+		if (sqlca.sqlcode < 0)
+			sqlprint();
+	}
 #line 20 "dynalloc2.pgc"
 
 
-   { ECPGdo(__LINE__, 0, 1, NULL, "set datestyle to postgres", ECPGt_EOIT, ECPGt_EORT);
+	{
+		ECPGdo(__LINE__, 0, 1, NULL, "set datestyle to postgres", ECPGt_EOIT, ECPGt_EORT);
 #line 22 "dynalloc2.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint (  );}
+		if (sqlca.sqlcode < 0)
+			sqlprint();
+	}
 #line 22 "dynalloc2.pgc"
 
 
-   { ECPGdo(__LINE__, 0, 1, NULL, "create  table test ( a int   , b text   )    ", ECPGt_EOIT, ECPGt_EORT);
+	{
+		ECPGdo(__LINE__, 0, 1, NULL, "create  table test ( a int   , b text   )    ", ECPGt_EOIT, ECPGt_EORT);
 #line 24 "dynalloc2.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint (  );}
+		if (sqlca.sqlcode < 0)
+			sqlprint();
+	}
 #line 24 "dynalloc2.pgc"
 
-   { ECPGdo(__LINE__, 0, 1, NULL, "insert into test values( 1 , 'one' ) ", ECPGt_EOIT, ECPGt_EORT);
+	{
+		ECPGdo(__LINE__, 0, 1, NULL, "insert into test values( 1 , 'one' ) ", ECPGt_EOIT, ECPGt_EORT);
 #line 25 "dynalloc2.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint (  );}
+		if (sqlca.sqlcode < 0)
+			sqlprint();
+	}
 #line 25 "dynalloc2.pgc"
 
-   { ECPGdo(__LINE__, 0, 1, NULL, "insert into test values( 2 , 'two' ) ", ECPGt_EOIT, ECPGt_EORT);
+	{
+		ECPGdo(__LINE__, 0, 1, NULL, "insert into test values( 2 , 'two' ) ", ECPGt_EOIT, ECPGt_EORT);
 #line 26 "dynalloc2.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint (  );}
+		if (sqlca.sqlcode < 0)
+			sqlprint();
+	}
 #line 26 "dynalloc2.pgc"
 
-   { ECPGdo(__LINE__, 0, 1, NULL, "insert into test values( null , 'three' ) ", ECPGt_EOIT, ECPGt_EORT);
+	{
+		ECPGdo(__LINE__, 0, 1, NULL, "insert into test values( null , 'three' ) ", ECPGt_EOIT, ECPGt_EORT);
 #line 27 "dynalloc2.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint (  );}
+		if (sqlca.sqlcode < 0)
+			sqlprint();
+	}
 #line 27 "dynalloc2.pgc"
 
-   { ECPGdo(__LINE__, 0, 1, NULL, "insert into test values( 4 , 'four' ) ", ECPGt_EOIT, ECPGt_EORT);
+	{
+		ECPGdo(__LINE__, 0, 1, NULL, "insert into test values( 4 , 'four' ) ", ECPGt_EOIT, ECPGt_EORT);
 #line 28 "dynalloc2.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint (  );}
+		if (sqlca.sqlcode < 0)
+			sqlprint();
+	}
 #line 28 "dynalloc2.pgc"
 
-   { ECPGdo(__LINE__, 0, 1, NULL, "insert into test values( 5 , null ) ", ECPGt_EOIT, ECPGt_EORT);
+	{
+		ECPGdo(__LINE__, 0, 1, NULL, "insert into test values( 5 , null ) ", ECPGt_EOIT, ECPGt_EORT);
 #line 29 "dynalloc2.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint (  );}
+		if (sqlca.sqlcode < 0)
+			sqlprint();
+	}
 #line 29 "dynalloc2.pgc"
 
-   { ECPGdo(__LINE__, 0, 1, NULL, "insert into test values( null , null ) ", ECPGt_EOIT, ECPGt_EORT);
+	{
+		ECPGdo(__LINE__, 0, 1, NULL, "insert into test values( null , null ) ", ECPGt_EOIT, ECPGt_EORT);
 #line 30 "dynalloc2.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint (  );}
+		if (sqlca.sqlcode < 0)
+			sqlprint();
+	}
 #line 30 "dynalloc2.pgc"
 
 
-   ECPGallocate_desc(__LINE__, "mydesc");
+	ECPGallocate_desc(__LINE__, "mydesc");
 #line 32 "dynalloc2.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint (  );
+	if (sqlca.sqlcode < 0)
+		sqlprint();
 #line 32 "dynalloc2.pgc"
 
-   { ECPGdo(__LINE__, 0, 1, NULL, "select  *  from test   ", ECPGt_EOIT, 
-	ECPGt_descriptor, "mydesc", 0L, 0L, 0L, 
-	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT);
+	{
+		ECPGdo(__LINE__, 0, 1, NULL, "select  *  from test   ", ECPGt_EOIT,
+			   ECPGt_descriptor, "mydesc", 0L, 0L, 0L,
+			   ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, ECPGt_EORT);
 #line 33 "dynalloc2.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint (  );}
+		if (sqlca.sqlcode < 0)
+			sqlprint();
+	}
 #line 33 "dynalloc2.pgc"
 
-   { ECPGget_desc_header(__LINE__, "mydesc", &(colnum));
+	{
+		ECPGget_desc_header(__LINE__, "mydesc", &(colnum));
 
 #line 34 "dynalloc2.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint (  );}
+		if (sqlca.sqlcode < 0)
+			sqlprint();
+	}
 #line 34 "dynalloc2.pgc"
 
-   { ECPGget_desc(__LINE__, "mydesc", 1,ECPGd_indicator,
-	ECPGt_int,&(ipointer1),(long)1,(long)0,sizeof(int), ECPGd_data,
-	ECPGt_int,&(ip1),(long)1,(long)0,sizeof(int), ECPGd_EODT);
+	{
+		ECPGget_desc(__LINE__, "mydesc", 1, ECPGd_indicator,
+		ECPGt_int, &(ipointer1), (long) 1, (long) 0, sizeof(int), ECPGd_data,
+			 ECPGt_int, &(ip1), (long) 1, (long) 0, sizeof(int), ECPGd_EODT);
 
 #line 35 "dynalloc2.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint (  );}
+		if (sqlca.sqlcode < 0)
+			sqlprint();
+	}
 #line 35 "dynalloc2.pgc"
 
-   { ECPGget_desc(__LINE__, "mydesc", 2,ECPGd_indicator,
-	ECPGt_int,&(ipointer2),(long)1,(long)0,sizeof(int), ECPGd_data,
-	ECPGt_char,&(cp2),(long)0,(long)0,(1)*sizeof(char), ECPGd_EODT);
+	{
+		ECPGget_desc(__LINE__, "mydesc", 2, ECPGd_indicator,
+		ECPGt_int, &(ipointer2), (long) 1, (long) 0, sizeof(int), ECPGd_data,
+					 ECPGt_char, &(cp2), (long) 0, (long) 0, (1) * sizeof(char), ECPGd_EODT);
 
 #line 36 "dynalloc2.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint (  );}
+		if (sqlca.sqlcode < 0)
+			sqlprint();
+	}
 #line 36 "dynalloc2.pgc"
 
 
-   printf("Result (%d columns):\n", colnum);
-   for (i=0;i < sqlca.sqlerrd[2];++i)
-   {
-      if (ipointer1[i]) printf("NULL, ");
-      else printf("%d, ",ip1[i]); 
-
-      if (ipointer2[i]) printf("NULL, ");
-      else printf("'%s', ",cp2[i]); 
-      printf("\n");
-   }
-   ECPGfree_auto_mem();
-   printf("\n");
-
-   ECPGdeallocate_desc(__LINE__, "mydesc");
+	printf("Result (%d columns):\n", colnum);
+	for (i = 0; i < sqlca.sqlerrd[2]; ++i)
+	{
+		if (ipointer1[i])
+			printf("NULL, ");
+		else
+			printf("%d, ", ip1[i]);
+
+		if (ipointer2[i])
+			printf("NULL, ");
+		else
+			printf("'%s', ", cp2[i]);
+		printf("\n");
+	}
+	ECPGfree_auto_mem();
+	printf("\n");
+
+	ECPGdeallocate_desc(__LINE__, "mydesc");
 #line 51 "dynalloc2.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint (  );
+	if (sqlca.sqlcode < 0)
+		sqlprint();
 #line 51 "dynalloc2.pgc"
 
-   { ECPGtrans(__LINE__, NULL, "rollback");
+	{
+		ECPGtrans(__LINE__, NULL, "rollback");
 #line 52 "dynalloc2.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint (  );}
+		if (sqlca.sqlcode < 0)
+			sqlprint();
+	}
 #line 52 "dynalloc2.pgc"
 
-   { ECPGdisconnect(__LINE__, "CURRENT");
+	{
+		ECPGdisconnect(__LINE__, "CURRENT");
 #line 53 "dynalloc2.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint (  );}
+		if (sqlca.sqlcode < 0)
+			sqlprint();
+	}
 #line 53 "dynalloc2.pgc"
 
-   return 0;
+	return 0;
 }