Fix whitespace

src/interfaces/ecpg/ecpglib/misc.c

@@ -535,13 +535,13 @@ ECPGset_var(int number, void *pointer, int lineno)
 	struct sqlca_t *sqlca = ECPGget_sqlca();
 
 	if (sqlca == NULL)
-        {
-                ecpg_raise(lineno, ECPG_OUT_OF_MEMORY,
-			ECPG_SQLSTATE_ECPG_OUT_OF_MEMORY, NULL);
-                return;
-        }
+	{
+		ecpg_raise(lineno, ECPG_OUT_OF_MEMORY,
+				   ECPG_SQLSTATE_ECPG_OUT_OF_MEMORY, NULL);
+		return;
+	}
 
-        ecpg_init_sqlca(sqlca);
+	ecpg_init_sqlca(sqlca);
 
 	for (ptr = ivlist; ptr != NULL; ptr = ptr->next)
 	{

src/interfaces/ecpg/ecpglib/prepare.c

@@ -36,11 +36,11 @@ typedef struct
 
 static int	nextStmtID = 1;
 static stmtCacheEntry *stmtCacheEntries = NULL;
-static struct declared_statement *g_declared_list; 
+static struct declared_statement *g_declared_list;
 
 static bool deallocate_one(int lineno, enum COMPAT_MODE c, struct connection *con,
 			   struct prepared_statement *prev, struct prepared_statement *this);
-static struct declared_statement *ecpg_find_declared_statement(const char *); 
+static struct declared_statement *ecpg_find_declared_statement(const char *);
 static bool
 isvarchar(unsigned char c)
 {
@@ -177,14 +177,14 @@ ECPGprepare(int lineno, const char *connection_name, const bool questionmarks,
 	struct connection *con;
 	struct prepared_statement *this,
 			   *prev;
-	const char *real_connection_name = NULL; 
+	const char *real_connection_name = NULL;
 
 	(void) questionmarks;		/* quiet the compiler */
 
 	real_connection_name = ecpg_get_con_name_by_declared_name(name);
 	if (real_connection_name == NULL)
 	{
-		/* 
+		/*
 		 * If can't get the connection name by declared name then using connection name
 		 * coming from the parameter connection_name
 		 */

src/interfaces/ecpg/test/expected/sql-bytea.c

@@ -80,7 +80,6 @@ main(void)
 	memset(recv_short_buf.arr, 0x0, sizeof(recv_short_buf.arr)); \
 } \
 while (0)
-	
 
 	ECPGdebug(1, stderr);
 
@@ -93,71 +92,71 @@ while (0)
 	}
 
     { ECPGconnect(__LINE__, 0, "ecpg1_regression" , NULL, NULL , NULL, 0); 
-#line 58 "bytea.pgc"
+#line 57 "bytea.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
-#line 58 "bytea.pgc"
+#line 57 "bytea.pgc"
 
 
 	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "create table if not exists test ( data1 bytea , data2 bytea )", ECPGt_EOIT, ECPGt_EORT);
-#line 60 "bytea.pgc"
+#line 59 "bytea.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
-#line 60 "bytea.pgc"
+#line 59 "bytea.pgc"
 
 
 	{ ECPGprepare(__LINE__, NULL, 0, "ins_stmt", "insert into test values(?,?)");
-#line 62 "bytea.pgc"
+#line 61 "bytea.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
-#line 62 "bytea.pgc"
+#line 61 "bytea.pgc"
 
 	{ ECPGprepare(__LINE__, NULL, 0, "sel_stmt", "select data1,data2 from test");
-#line 63 "bytea.pgc"
+#line 62 "bytea.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
-#line 63 "bytea.pgc"
+#line 62 "bytea.pgc"
 
 	ECPGallocate_desc(__LINE__, "idesc");
-#line 64 "bytea.pgc"
+#line 63 "bytea.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();
-#line 64 "bytea.pgc"
+#line 63 "bytea.pgc"
 
 	ECPGallocate_desc(__LINE__, "odesc");
-#line 65 "bytea.pgc"
+#line 64 "bytea.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();
-#line 65 "bytea.pgc"
+#line 64 "bytea.pgc"
 
 
 	/* Test for static sql statement with normal host variable, indicator */
 	init();
 	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "truncate test", ECPGt_EOIT, ECPGt_EORT);
-#line 69 "bytea.pgc"
+#line 68 "bytea.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
-#line 69 "bytea.pgc"
+#line 68 "bytea.pgc"
 
 	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into test values ( $1  , $2  )", 
 	ECPGt_bytea,&(send_buf[0]),(long)DATA_SIZE,(long)1,sizeof(struct bytea_1), 
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, 
 	ECPGt_bytea,&(send_buf[1]),(long)DATA_SIZE,(long)1,sizeof(struct bytea_1), 
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT);
-#line 70 "bytea.pgc"
+#line 69 "bytea.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
-#line 70 "bytea.pgc"
+#line 69 "bytea.pgc"
 
 	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select data1 , data2 from test", ECPGt_EOIT, 
 	ECPGt_bytea,&(recv_buf[0]),(long)DATA_SIZE,(long)1,sizeof(struct bytea_2), 
 	ECPGt_int,&(ind[0]),(long)1,(long)1,sizeof(int), 
 	ECPGt_bytea,&(recv_short_buf),(long)DATA_SIZE - LACK_SIZE,(long)1,sizeof(struct bytea_4), 
 	ECPGt_int,&(ind[1]),(long)1,(long)1,sizeof(int), ECPGt_EORT);
-#line 71 "bytea.pgc"
+#line 70 "bytea.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
-#line 71 "bytea.pgc"
+#line 70 "bytea.pgc"
 
 	dump_binary(recv_buf[0].arr, recv_buf[0].len, ind[0]);
 	dump_binary(recv_short_buf.arr, recv_short_buf.len, ind[1]);
@@ -165,38 +164,38 @@ if (sqlca.sqlcode < 0) sqlprint();}
 	/* Test for variable length array */
 	init();
 	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "truncate test", ECPGt_EOIT, ECPGt_EORT);
-#line 77 "bytea.pgc"
+#line 76 "bytea.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
-#line 77 "bytea.pgc"
+#line 76 "bytea.pgc"
 
 	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into test values ( $1  , $2  )", 
 	ECPGt_bytea,&(send_buf[0]),(long)DATA_SIZE,(long)1,sizeof(struct bytea_1), 
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, 
 	ECPGt_bytea,&(send_buf[1]),(long)DATA_SIZE,(long)1,sizeof(struct bytea_1), 
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT);
-#line 78 "bytea.pgc"
+#line 77 "bytea.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
-#line 78 "bytea.pgc"
+#line 77 "bytea.pgc"
 
 	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into test values ( $1  , $2  )", 
 	ECPGt_bytea,&(send_buf[0]),(long)DATA_SIZE,(long)1,sizeof(struct bytea_1), 
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, 
 	ECPGt_bytea,&(send_buf[1]),(long)DATA_SIZE,(long)1,sizeof(struct bytea_1), 
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT);
-#line 79 "bytea.pgc"
+#line 78 "bytea.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
-#line 79 "bytea.pgc"
+#line 78 "bytea.pgc"
 
 	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select data1 from test", ECPGt_EOIT, 
 	ECPGt_bytea,&(recv_vlen_buf),(long)DATA_SIZE,(long)0,sizeof(struct bytea_3), 
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT);
-#line 80 "bytea.pgc"
+#line 79 "bytea.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
-#line 80 "bytea.pgc"
+#line 79 "bytea.pgc"
 
 	dump_binary(recv_vlen_buf[0].arr, recv_vlen_buf[0].len, 0);
 	dump_binary(recv_vlen_buf[1].arr, recv_vlen_buf[1].len, 0);
@@ -205,30 +204,30 @@ if (sqlca.sqlcode < 0) sqlprint();}
 	/* Test for dynamic sql statement with normal host variable, indicator */
 	init();
 	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "truncate test", ECPGt_EOIT, ECPGt_EORT);
-#line 87 "bytea.pgc"
+#line 86 "bytea.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
-#line 87 "bytea.pgc"
+#line 86 "bytea.pgc"
 
 	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_execute, "ins_stmt", 
 	ECPGt_bytea,&(send_buf[0]),(long)DATA_SIZE,(long)1,sizeof(struct bytea_1), 
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, 
 	ECPGt_bytea,&(send_buf[1]),(long)DATA_SIZE,(long)1,sizeof(struct bytea_1), 
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT);
-#line 88 "bytea.pgc"
+#line 87 "bytea.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
-#line 88 "bytea.pgc"
+#line 87 "bytea.pgc"
 
 	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_execute, "sel_stmt", ECPGt_EOIT, 
 	ECPGt_bytea,&(recv_buf[0]),(long)DATA_SIZE,(long)1,sizeof(struct bytea_2), 
 	ECPGt_int,&(ind[0]),(long)1,(long)1,sizeof(int), 
 	ECPGt_bytea,&(recv_short_buf),(long)DATA_SIZE - LACK_SIZE,(long)1,sizeof(struct bytea_4), 
 	ECPGt_int,&(ind[1]),(long)1,(long)1,sizeof(int), ECPGt_EORT);
-#line 89 "bytea.pgc"
+#line 88 "bytea.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
-#line 89 "bytea.pgc"
+#line 88 "bytea.pgc"
 
 	dump_binary(recv_buf[0].arr, recv_buf[0].len, ind[0]);
 	dump_binary(recv_short_buf.arr, recv_short_buf.len, ind[1]);
@@ -236,81 +235,81 @@ if (sqlca.sqlcode < 0) sqlprint();}
 	/* Test for dynamic sql statement with sql descriptor */
 	init();
 	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "truncate test", ECPGt_EOIT, ECPGt_EORT);
-#line 95 "bytea.pgc"
+#line 94 "bytea.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
-#line 95 "bytea.pgc"
+#line 94 "bytea.pgc"
 
 	{ ECPGset_desc(__LINE__, "idesc", 1,ECPGd_data,
 	ECPGt_bytea,&(send_buf[0]),(long)DATA_SIZE,(long)1,sizeof(struct bytea_1), ECPGd_EODT);
 
-#line 96 "bytea.pgc"
+#line 95 "bytea.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
-#line 96 "bytea.pgc"
+#line 95 "bytea.pgc"
 
 	{ ECPGset_desc(__LINE__, "idesc", 2,ECPGd_data,
 	ECPGt_bytea,&(send_buf[1]),(long)DATA_SIZE,(long)1,sizeof(struct bytea_1), ECPGd_EODT);
 
-#line 97 "bytea.pgc"
+#line 96 "bytea.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
-#line 97 "bytea.pgc"
+#line 96 "bytea.pgc"
 
 	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_execute, "ins_stmt", 
 	ECPGt_descriptor, "idesc", 1L, 1L, 1L, 
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT);
-#line 98 "bytea.pgc"
+#line 97 "bytea.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
-#line 98 "bytea.pgc"
+#line 97 "bytea.pgc"
 
 	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_execute, "sel_stmt", ECPGt_EOIT, 
 	ECPGt_descriptor, "odesc", 1L, 1L, 1L, 
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT);
-#line 99 "bytea.pgc"
+#line 98 "bytea.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
-#line 99 "bytea.pgc"
+#line 98 "bytea.pgc"
 
 	{ ECPGget_desc(__LINE__, "odesc", 1,ECPGd_indicator,
 	ECPGt_int,&(ind[0]),(long)1,(long)1,sizeof(int), ECPGd_data,
 	ECPGt_bytea,&(recv_buf[0]),(long)DATA_SIZE,(long)1,sizeof(struct bytea_2), ECPGd_EODT);
 
-#line 100 "bytea.pgc"
+#line 99 "bytea.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
-#line 100 "bytea.pgc"
+#line 99 "bytea.pgc"
 
 	{ ECPGget_desc(__LINE__, "odesc", 2,ECPGd_indicator,
 	ECPGt_int,&(ind[1]),(long)1,(long)1,sizeof(int), ECPGd_data,
 	ECPGt_bytea,&(recv_short_buf),(long)DATA_SIZE - LACK_SIZE,(long)1,sizeof(struct bytea_4), ECPGd_EODT);
 
-#line 101 "bytea.pgc"
+#line 100 "bytea.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
-#line 101 "bytea.pgc"
+#line 100 "bytea.pgc"
 
 	dump_binary(recv_buf[0].arr, recv_buf[0].len, ind[0]);
 	dump_binary(recv_short_buf.arr, recv_short_buf.len, ind[1]);
 
 	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "drop table test", ECPGt_EOIT, ECPGt_EORT);
-#line 105 "bytea.pgc"
+#line 104 "bytea.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
-#line 105 "bytea.pgc"
+#line 104 "bytea.pgc"
 
 	{ ECPGtrans(__LINE__, NULL, "commit");
-#line 106 "bytea.pgc"
+#line 105 "bytea.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
-#line 106 "bytea.pgc"
+#line 105 "bytea.pgc"
 
 	{ ECPGdisconnect(__LINE__, "CURRENT");
-#line 107 "bytea.pgc"
+#line 106 "bytea.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
-#line 107 "bytea.pgc"
+#line 106 "bytea.pgc"
 
 
 	return 0;

src/interfaces/ecpg/test/sql/bytea.pgc

@@ -43,7 +43,6 @@ exec sql end declare section;
 	memset(recv_short_buf.arr, 0x0, sizeof(recv_short_buf.arr)); \
 } \
 while (0)
-	
 
 	ECPGdebug(1, stderr);