Skip to content

Commit aad21d4

Browse files
peterepetere
committed
Fix whitespace
1 parent 97b6f2e commit aad21d4

File tree

5 files changed

+130
-132
lines changed

5 files changed

+130
-132
lines changed

‎src/interfaces/ecpg/ecpglib/misc.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -535,13 +535,13 @@ ECPGset_var(int number, void *pointer, int lineno)
535535
struct sqlca_t *sqlca = ECPGget_sqlca();
536536

537537
if (sqlca == NULL)
538-
{
539-
ecpg_raise(lineno, ECPG_OUT_OF_MEMORY,
540-
ECPG_SQLSTATE_ECPG_OUT_OF_MEMORY, NULL);
541-
return;
542-
}
538+
{
539+
ecpg_raise(lineno, ECPG_OUT_OF_MEMORY,
540+
ECPG_SQLSTATE_ECPG_OUT_OF_MEMORY, NULL);
541+
return;
542+
}
543543

544-
ecpg_init_sqlca(sqlca);
544+
ecpg_init_sqlca(sqlca);
545545

546546
for (ptr = ivlist; ptr != NULL; ptr = ptr->next)
547547
{

‎src/interfaces/ecpg/ecpglib/prepare.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@ typedef struct
3636

3737
static int nextStmtID = 1;
3838
static stmtCacheEntry *stmtCacheEntries = NULL;
39-
static struct declared_statement *g_declared_list;
39+
static struct declared_statement *g_declared_list;
4040

4141
static bool deallocate_one(int lineno, enum COMPAT_MODE c, struct connection *con,
4242
struct prepared_statement *prev, struct prepared_statement *this);
43-
static struct declared_statement *ecpg_find_declared_statement(const char *);
43+
static struct declared_statement *ecpg_find_declared_statement(const char *);
4444
static bool
4545
isvarchar(unsigned char c)
4646
{
@@ -177,14 +177,14 @@ ECPGprepare(int lineno, const char *connection_name, const bool questionmarks,
177177
struct connection *con;
178178
struct prepared_statement *this,
179179
*prev;
180-
const char *real_connection_name = NULL;
180+
const char *real_connection_name = NULL;
181181

182182
(void) questionmarks; /* quiet the compiler */
183183

184184
real_connection_name = ecpg_get_con_name_by_declared_name(name);
185185
if (real_connection_name == NULL)
186186
{
187-
/*
187+
/*
188188
* If can't get the connection name by declared name then using connection name
189189
* coming from the parameter connection_name
190190
*/

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

Lines changed: 52 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ main(void)
8080
memset(recv_short_buf.arr, 0x0, sizeof(recv_short_buf.arr)); \
8181
} \
8282
while (0)
83-
8483

8584
ECPGdebug(1, stderr);
8685

@@ -93,110 +92,110 @@ while (0)
9392
}
9493

9594
{ ECPGconnect(__LINE__, 0, "ecpg1_regression" , NULL, NULL , NULL, 0);
96-
#line 58 "bytea.pgc"
95+
#line 57 "bytea.pgc"
9796

9897
if (sqlca.sqlcode < 0) sqlprint();}
99-
#line 58 "bytea.pgc"
98+
#line 57 "bytea.pgc"
10099

101100

102101
{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "create table if not exists test ( data1 bytea , data2 bytea )", ECPGt_EOIT, ECPGt_EORT);
103-
#line 60 "bytea.pgc"
102+
#line 59 "bytea.pgc"
104103

105104
if (sqlca.sqlcode < 0) sqlprint();}
106-
#line 60 "bytea.pgc"
105+
#line 59 "bytea.pgc"
107106

108107

109108
{ ECPGprepare(__LINE__, NULL, 0, "ins_stmt", "insert into test values(?,?)");
110-
#line 62 "bytea.pgc"
109+
#line 61 "bytea.pgc"
111110

112111
if (sqlca.sqlcode < 0) sqlprint();}
113-
#line 62 "bytea.pgc"
112+
#line 61 "bytea.pgc"
114113

115114
{ ECPGprepare(__LINE__, NULL, 0, "sel_stmt", "select data1,data2 from test");
116-
#line 63 "bytea.pgc"
115+
#line 62 "bytea.pgc"
117116

118117
if (sqlca.sqlcode < 0) sqlprint();}
119-
#line 63 "bytea.pgc"
118+
#line 62 "bytea.pgc"
120119

121120
ECPGallocate_desc(__LINE__, "idesc");
122-
#line 64 "bytea.pgc"
121+
#line 63 "bytea.pgc"
123122

124123
if (sqlca.sqlcode < 0) sqlprint();
125-
#line 64 "bytea.pgc"
124+
#line 63 "bytea.pgc"
126125

127126
ECPGallocate_desc(__LINE__, "odesc");
128-
#line 65 "bytea.pgc"
127+
#line 64 "bytea.pgc"
129128

130129
if (sqlca.sqlcode < 0) sqlprint();
131-
#line 65 "bytea.pgc"
130+
#line 64 "bytea.pgc"
132131

133132

134133
/* Test for static sql statement with normal host variable, indicator */
135134
init();
136135
{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "truncate test", ECPGt_EOIT, ECPGt_EORT);
137-
#line 69 "bytea.pgc"
136+
#line 68 "bytea.pgc"
138137

139138
if (sqlca.sqlcode < 0) sqlprint();}
140-
#line 69 "bytea.pgc"
139+
#line 68 "bytea.pgc"
141140

142141
{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into test values ( $1 , $2 )",
143142
ECPGt_bytea,&(send_buf[0]),(long)DATA_SIZE,(long)1,sizeof(struct bytea_1),
144143
ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L,
145144
ECPGt_bytea,&(send_buf[1]),(long)DATA_SIZE,(long)1,sizeof(struct bytea_1),
146145
ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT);
147-
#line 70 "bytea.pgc"
146+
#line 69 "bytea.pgc"
148147

149148
if (sqlca.sqlcode < 0) sqlprint();}
150-
#line 70 "bytea.pgc"
149+
#line 69 "bytea.pgc"
151150

152151
{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select data1 , data2 from test", ECPGt_EOIT,
153152
ECPGt_bytea,&(recv_buf[0]),(long)DATA_SIZE,(long)1,sizeof(struct bytea_2),
154153
ECPGt_int,&(ind[0]),(long)1,(long)1,sizeof(int),
155154
ECPGt_bytea,&(recv_short_buf),(long)DATA_SIZE - LACK_SIZE,(long)1,sizeof(struct bytea_4),
156155
ECPGt_int,&(ind[1]),(long)1,(long)1,sizeof(int), ECPGt_EORT);
157-
#line 71 "bytea.pgc"
156+
#line 70 "bytea.pgc"
158157

159158
if (sqlca.sqlcode < 0) sqlprint();}
160-
#line 71 "bytea.pgc"
159+
#line 70 "bytea.pgc"
161160

162161
dump_binary(recv_buf[0].arr, recv_buf[0].len, ind[0]);
163162
dump_binary(recv_short_buf.arr, recv_short_buf.len, ind[1]);
164163

165164
/* Test for variable length array */
166165
init();
167166
{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "truncate test", ECPGt_EOIT, ECPGt_EORT);
168-
#line 77 "bytea.pgc"
167+
#line 76 "bytea.pgc"
169168

170169
if (sqlca.sqlcode < 0) sqlprint();}
171-
#line 77 "bytea.pgc"
170+
#line 76 "bytea.pgc"
172171

173172
{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into test values ( $1 , $2 )",
174173
ECPGt_bytea,&(send_buf[0]),(long)DATA_SIZE,(long)1,sizeof(struct bytea_1),
175174
ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L,
176175
ECPGt_bytea,&(send_buf[1]),(long)DATA_SIZE,(long)1,sizeof(struct bytea_1),
177176
ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT);
178-
#line 78 "bytea.pgc"
177+
#line 77 "bytea.pgc"
179178

180179
if (sqlca.sqlcode < 0) sqlprint();}
181-
#line 78 "bytea.pgc"
180+
#line 77 "bytea.pgc"
182181

183182
{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into test values ( $1 , $2 )",
184183
ECPGt_bytea,&(send_buf[0]),(long)DATA_SIZE,(long)1,sizeof(struct bytea_1),
185184
ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L,
186185
ECPGt_bytea,&(send_buf[1]),(long)DATA_SIZE,(long)1,sizeof(struct bytea_1),
187186
ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT);
188-
#line 79 "bytea.pgc"
187+
#line 78 "bytea.pgc"
189188

190189
if (sqlca.sqlcode < 0) sqlprint();}
191-
#line 79 "bytea.pgc"
190+
#line 78 "bytea.pgc"
192191

193192
{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select data1 from test", ECPGt_EOIT,
194193
ECPGt_bytea,&(recv_vlen_buf),(long)DATA_SIZE,(long)0,sizeof(struct bytea_3),
195194
ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT);
196-
#line 80 "bytea.pgc"
195+
#line 79 "bytea.pgc"
197196

198197
if (sqlca.sqlcode < 0) sqlprint();}
199-
#line 80 "bytea.pgc"
198+
#line 79 "bytea.pgc"
200199

201200
dump_binary(recv_vlen_buf[0].arr, recv_vlen_buf[0].len, 0);
202201
dump_binary(recv_vlen_buf[1].arr, recv_vlen_buf[1].len, 0);
@@ -205,112 +204,112 @@ if (sqlca.sqlcode < 0) sqlprint();}
205204
/* Test for dynamic sql statement with normal host variable, indicator */
206205
init();
207206
{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "truncate test", ECPGt_EOIT, ECPGt_EORT);
208-
#line 87 "bytea.pgc"
207+
#line 86 "bytea.pgc"
209208

210209
if (sqlca.sqlcode < 0) sqlprint();}
211-
#line 87 "bytea.pgc"
210+
#line 86 "bytea.pgc"
212211

213212
{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_execute, "ins_stmt",
214213
ECPGt_bytea,&(send_buf[0]),(long)DATA_SIZE,(long)1,sizeof(struct bytea_1),
215214
ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L,
216215
ECPGt_bytea,&(send_buf[1]),(long)DATA_SIZE,(long)1,sizeof(struct bytea_1),
217216
ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT);
218-
#line 88 "bytea.pgc"
217+
#line 87 "bytea.pgc"
219218

220219
if (sqlca.sqlcode < 0) sqlprint();}
221-
#line 88 "bytea.pgc"
220+
#line 87 "bytea.pgc"
222221

223222
{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_execute, "sel_stmt", ECPGt_EOIT,
224223
ECPGt_bytea,&(recv_buf[0]),(long)DATA_SIZE,(long)1,sizeof(struct bytea_2),
225224
ECPGt_int,&(ind[0]),(long)1,(long)1,sizeof(int),
226225
ECPGt_bytea,&(recv_short_buf),(long)DATA_SIZE - LACK_SIZE,(long)1,sizeof(struct bytea_4),
227226
ECPGt_int,&(ind[1]),(long)1,(long)1,sizeof(int), ECPGt_EORT);
228-
#line 89 "bytea.pgc"
227+
#line 88 "bytea.pgc"
229228

230229
if (sqlca.sqlcode < 0) sqlprint();}
231-
#line 89 "bytea.pgc"
230+
#line 88 "bytea.pgc"
232231

233232
dump_binary(recv_buf[0].arr, recv_buf[0].len, ind[0]);
234233
dump_binary(recv_short_buf.arr, recv_short_buf.len, ind[1]);
235234

236235
/* Test for dynamic sql statement with sql descriptor */
237236
init();
238237
{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "truncate test", ECPGt_EOIT, ECPGt_EORT);
239-
#line 95 "bytea.pgc"
238+
#line 94 "bytea.pgc"
240239

241240
if (sqlca.sqlcode < 0) sqlprint();}
242-
#line 95 "bytea.pgc"
241+
#line 94 "bytea.pgc"
243242

244243
{ ECPGset_desc(__LINE__, "idesc", 1,ECPGd_data,
245244
ECPGt_bytea,&(send_buf[0]),(long)DATA_SIZE,(long)1,sizeof(struct bytea_1), ECPGd_EODT);
246245

247-
#line 96 "bytea.pgc"
246+
#line 95 "bytea.pgc"
248247

249248
if (sqlca.sqlcode < 0) sqlprint();}
250-
#line 96 "bytea.pgc"
249+
#line 95 "bytea.pgc"
251250

252251
{ ECPGset_desc(__LINE__, "idesc", 2,ECPGd_data,
253252
ECPGt_bytea,&(send_buf[1]),(long)DATA_SIZE,(long)1,sizeof(struct bytea_1), ECPGd_EODT);
254253

255-
#line 97 "bytea.pgc"
254+
#line 96 "bytea.pgc"
256255

257256
if (sqlca.sqlcode < 0) sqlprint();}
258-
#line 97 "bytea.pgc"
257+
#line 96 "bytea.pgc"
259258

260259
{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_execute, "ins_stmt",
261260
ECPGt_descriptor, "idesc", 1L, 1L, 1L,
262261
ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT);
263-
#line 98 "bytea.pgc"
262+
#line 97 "bytea.pgc"
264263

265264
if (sqlca.sqlcode < 0) sqlprint();}
266-
#line 98 "bytea.pgc"
265+
#line 97 "bytea.pgc"
267266

268267
{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_execute, "sel_stmt", ECPGt_EOIT,
269268
ECPGt_descriptor, "odesc", 1L, 1L, 1L,
270269
ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT);
271-
#line 99 "bytea.pgc"
270+
#line 98 "bytea.pgc"
272271

273272
if (sqlca.sqlcode < 0) sqlprint();}
274-
#line 99 "bytea.pgc"
273+
#line 98 "bytea.pgc"
275274

276275
{ ECPGget_desc(__LINE__, "odesc", 1,ECPGd_indicator,
277276
ECPGt_int,&(ind[0]),(long)1,(long)1,sizeof(int), ECPGd_data,
278277
ECPGt_bytea,&(recv_buf[0]),(long)DATA_SIZE,(long)1,sizeof(struct bytea_2), ECPGd_EODT);
279278

280-
#line 100 "bytea.pgc"
279+
#line 99 "bytea.pgc"
281280

282281
if (sqlca.sqlcode < 0) sqlprint();}
283-
#line 100 "bytea.pgc"
282+
#line 99 "bytea.pgc"
284283

285284
{ ECPGget_desc(__LINE__, "odesc", 2,ECPGd_indicator,
286285
ECPGt_int,&(ind[1]),(long)1,(long)1,sizeof(int), ECPGd_data,
287286
ECPGt_bytea,&(recv_short_buf),(long)DATA_SIZE - LACK_SIZE,(long)1,sizeof(struct bytea_4), ECPGd_EODT);
288287

289-
#line 101 "bytea.pgc"
288+
#line 100 "bytea.pgc"
290289

291290
if (sqlca.sqlcode < 0) sqlprint();}
292-
#line 101 "bytea.pgc"
291+
#line 100 "bytea.pgc"
293292

294293
dump_binary(recv_buf[0].arr, recv_buf[0].len, ind[0]);
295294
dump_binary(recv_short_buf.arr, recv_short_buf.len, ind[1]);
296295

297296
{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "drop table test", ECPGt_EOIT, ECPGt_EORT);
298-
#line 105 "bytea.pgc"
297+
#line 104 "bytea.pgc"
299298

300299
if (sqlca.sqlcode < 0) sqlprint();}
301-
#line 105 "bytea.pgc"
300+
#line 104 "bytea.pgc"
302301

303302
{ ECPGtrans(__LINE__, NULL, "commit");
304-
#line 106 "bytea.pgc"
303+
#line 105 "bytea.pgc"
305304

306305
if (sqlca.sqlcode < 0) sqlprint();}
307-
#line 106 "bytea.pgc"
306+
#line 105 "bytea.pgc"
308307

309308
{ ECPGdisconnect(__LINE__, "CURRENT");
310-
#line 107 "bytea.pgc"
309+
#line 106 "bytea.pgc"
311310

312311
if (sqlca.sqlcode < 0) sqlprint();}
313-
#line 107 "bytea.pgc"
312+
#line 106 "bytea.pgc"
314313

315314

316315
return 0;

0 commit comments

Comments
 (0)