Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit faddd3f

Browse files
author
Michael Meskes
committed
Applied Zoltan's patch to remove hardware dependant offset logging and
superfluous include files.
1 parent 946cf22 commit faddd3f

File tree

3 files changed

+0
-477
lines changed

3 files changed

+0
-477
lines changed

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

Lines changed: 0 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@
1010
#include "postgres_fe.h"
1111
#include "pg_type.h"
1212

13-
#include <inttypes.h>
14-
#include <dlfcn.h>
15-
1613
#include "ecpg-pthread-win32.h"
1714
#include "decimal.h"
1815
#include "ecpgtype.h"
@@ -80,38 +77,30 @@ sqlda_common_total_size(const PGresult *res, int row, enum COMPAT_MODE compat, l
8077
case ECPGt_short:
8178
case ECPGt_unsigned_short:
8279
ecpg_sqlda_align_add_size(offset, sizeof(short), sizeof(short), &offset, &next_offset);
83-
ecpg_log("%s type %s offset %d\n", __FUNCTION__, ecpg_type_name(type), offset);
8480
break;
8581
case ECPGt_int:
8682
case ECPGt_unsigned_int:
8783
ecpg_sqlda_align_add_size(offset, sizeof(int), sizeof(int), &offset, &next_offset);
88-
ecpg_log("%s type %s offset %d\n", __FUNCTION__, ecpg_type_name(type), offset);
8984
break;
9085
case ECPGt_long:
9186
case ECPGt_unsigned_long:
9287
ecpg_sqlda_align_add_size(offset, sizeof(long), sizeof(long), &offset, &next_offset);
93-
ecpg_log("%s type %s offset %d\n", __FUNCTION__, ecpg_type_name(type), offset);
9488
break;
9589
case ECPGt_long_long:
9690
case ECPGt_unsigned_long_long:
9791
ecpg_sqlda_align_add_size(offset, sizeof(long long), sizeof(long long), &offset, &next_offset);
98-
ecpg_log("%s type %s offset %d\n", __FUNCTION__, ecpg_type_name(type), offset);
9992
break;
10093
case ECPGt_bool:
10194
ecpg_sqlda_align_add_size(offset, sizeof(bool), sizeof(bool), &offset, &next_offset);
102-
ecpg_log("%s type %s offset %d\n", __FUNCTION__, ecpg_type_name(type), offset);
10395
break;
10496
case ECPGt_float:
10597
ecpg_sqlda_align_add_size(offset, sizeof(float), sizeof(float), &offset, &next_offset);
106-
ecpg_log("%s type %s offset %d\n", __FUNCTION__, ecpg_type_name(type), offset);
10798
break;
10899
case ECPGt_double:
109100
ecpg_sqlda_align_add_size(offset, sizeof(double), sizeof(double), &offset, &next_offset);
110-
ecpg_log("%s type %s offset %d\n", __FUNCTION__, ecpg_type_name(type), offset);
111101
break;
112102
case ECPGt_decimal:
113103
ecpg_sqlda_align_add_size(offset, sizeof(int), sizeof(decimal), &offset, &next_offset);
114-
ecpg_log("%s type %s offset %d\n", __FUNCTION__, ecpg_type_name(type), offset);
115104
break;
116105
case ECPGt_numeric:
117106
/*
@@ -120,7 +109,6 @@ sqlda_common_total_size(const PGresult *res, int row, enum COMPAT_MODE compat, l
120109
* of the space needed for the numeric structure.
121110
*/
122111
ecpg_sqlda_align_add_size(offset, sizeof(int), sizeof(numeric), &offset, &next_offset);
123-
ecpg_log("%s type %s offset1 %d\n", __FUNCTION__, ecpg_type_name(type), offset);
124112
if (!PQgetisnull(res, row, i))
125113
{
126114
char *val = PQgetvalue(res, row, i);
@@ -130,21 +118,17 @@ sqlda_common_total_size(const PGresult *res, int row, enum COMPAT_MODE compat, l
130118
if (!num)
131119
break;
132120
ecpg_sqlda_align_add_size(next_offset, sizeof(int), num->ndigits + 1, &offset, &next_offset);
133-
ecpg_log("%s type %s offset2 %d\n", __FUNCTION__, ecpg_type_name(type), offset);
134121
PGTYPESnumeric_free(num);
135122
}
136123
break;
137124
case ECPGt_date:
138125
ecpg_sqlda_align_add_size(offset, sizeof(int), sizeof(date), &offset, &next_offset);
139-
ecpg_log("%s type %s offset %d\n", __FUNCTION__, ecpg_type_name(type), offset);
140126
break;
141127
case ECPGt_timestamp:
142128
ecpg_sqlda_align_add_size(offset, sizeof(int), sizeof(timestamp), &offset, &next_offset);
143-
ecpg_log("%s type %s offset %d\n", __FUNCTION__, ecpg_type_name(type), offset);
144129
break;
145130
case ECPGt_interval:
146131
ecpg_sqlda_align_add_size(offset, sizeof(int), sizeof(interval), &offset, &next_offset);
147-
ecpg_log("%s type %s offset %d\n", __FUNCTION__, ecpg_type_name(type), offset);
148132
break;
149133
case ECPGt_char:
150134
case ECPGt_unsigned_char:
@@ -153,7 +137,6 @@ sqlda_common_total_size(const PGresult *res, int row, enum COMPAT_MODE compat, l
153137
{
154138
long datalen = strlen(PQgetvalue(res, row, i)) + 1;
155139
ecpg_sqlda_align_add_size(offset, sizeof(int), datalen, &offset, &next_offset);
156-
ecpg_log("%s type %s offset %d\n", __FUNCTION__, ecpg_type_name(type), offset);
157140
break;
158141
}
159142
}
@@ -285,52 +268,44 @@ ecpg_set_compat_sqlda(int lineno, struct sqlda_compat **_sqlda, const PGresult *
285268
ecpg_sqlda_align_add_size(offset, sizeof(short), sizeof(short), &offset, &next_offset);
286269
sqlda->sqlvar[i].sqldata = (char *)sqlda + offset;
287270
sqlda->sqlvar[i].sqllen = sizeof(short);
288-
ecpg_log("%s type %s offset %d\n", __FUNCTION__, ecpg_type_name(sqlda->sqlvar[i].sqltype), offset);
289271
break;
290272
case ECPGt_int:
291273
case ECPGt_unsigned_int:
292274
ecpg_sqlda_align_add_size(offset, sizeof(int), sizeof(int), &offset, &next_offset);
293275
sqlda->sqlvar[i].sqldata = (char *)sqlda + offset;
294276
sqlda->sqlvar[i].sqllen = sizeof(int);
295-
ecpg_log("%s type %s offset %d\n", __FUNCTION__, ecpg_type_name(sqlda->sqlvar[i].sqltype), offset);
296277
break;
297278
case ECPGt_long:
298279
case ECPGt_unsigned_long:
299280
ecpg_sqlda_align_add_size(offset, sizeof(long), sizeof(long), &offset, &next_offset);
300281
sqlda->sqlvar[i].sqldata = (char *)sqlda + offset;
301282
sqlda->sqlvar[i].sqllen = sizeof(long);
302-
ecpg_log("%s type %s offset %d\n", __FUNCTION__, ecpg_type_name(sqlda->sqlvar[i].sqltype), offset);
303283
break;
304284
case ECPGt_long_long:
305285
case ECPGt_unsigned_long_long:
306286
ecpg_sqlda_align_add_size(offset, sizeof(long long), sizeof(long long), &offset, &next_offset);
307287
sqlda->sqlvar[i].sqldata = (char *)sqlda + offset;
308288
sqlda->sqlvar[i].sqllen = sizeof(long long);
309-
ecpg_log("%s type %s offset %d\n", __FUNCTION__, ecpg_type_name(sqlda->sqlvar[i].sqltype), offset);
310289
break;
311290
case ECPGt_bool:
312291
ecpg_sqlda_align_add_size(offset, sizeof(bool), sizeof(bool), &offset, &next_offset);
313292
sqlda->sqlvar[i].sqldata = (char *)sqlda + offset;
314293
sqlda->sqlvar[i].sqllen = sizeof(bool);
315-
ecpg_log("%s type %s offset %d\n", __FUNCTION__, ecpg_type_name(sqlda->sqlvar[i].sqltype), offset);
316294
break;
317295
case ECPGt_float:
318296
ecpg_sqlda_align_add_size(offset, sizeof(float), sizeof(float), &offset, &next_offset);
319297
sqlda->sqlvar[i].sqldata = (char *)sqlda + offset;
320298
sqlda->sqlvar[i].sqllen = sizeof(float);
321-
ecpg_log("%s type %s offset %d\n", __FUNCTION__, ecpg_type_name(sqlda->sqlvar[i].sqltype), offset);
322299
break;
323300
case ECPGt_double:
324301
ecpg_sqlda_align_add_size(offset, sizeof(double), sizeof(double), &offset, &next_offset);
325302
sqlda->sqlvar[i].sqldata = (char *)sqlda + offset;
326303
sqlda->sqlvar[i].sqllen = sizeof(double);
327-
ecpg_log("%s type %s offset %d\n", __FUNCTION__, ecpg_type_name(sqlda->sqlvar[i].sqltype), offset);
328304
break;
329305
case ECPGt_decimal:
330306
ecpg_sqlda_align_add_size(offset, sizeof(int), sizeof(decimal), &offset, &next_offset);
331307
sqlda->sqlvar[i].sqldata = (char *)sqlda + offset;
332308
sqlda->sqlvar[i].sqllen = sizeof(decimal);
333-
ecpg_log("%s type %s offset %d\n", __FUNCTION__, ecpg_type_name(sqlda->sqlvar[i].sqltype), offset);
334309
break;
335310
case ECPGt_numeric:
336311
{
@@ -342,7 +317,6 @@ ecpg_set_compat_sqlda(int lineno, struct sqlda_compat **_sqlda, const PGresult *
342317
ecpg_sqlda_align_add_size(offset, sizeof(int), sizeof(numeric), &offset, &next_offset);
343318
sqlda->sqlvar[i].sqldata = (char *)sqlda + offset;
344319
sqlda->sqlvar[i].sqllen = sizeof(numeric);
345-
ecpg_log("%s type %s offset1 %d\n", __FUNCTION__, ecpg_type_name(sqlda->sqlvar[i].sqltype), offset);
346320

347321
if (PQgetisnull(res, row, i))
348322
{
@@ -362,7 +336,6 @@ ecpg_set_compat_sqlda(int lineno, struct sqlda_compat **_sqlda, const PGresult *
362336

363337
ecpg_sqlda_align_add_size(next_offset, sizeof(int), num->ndigits + 1, &offset, &next_offset);
364338
memcpy((char *)sqlda + offset, num->buf, num->ndigits + 1);
365-
ecpg_log("%s type %s offset2 %d\n", __FUNCTION__, ecpg_type_name(sqlda->sqlvar[i].sqltype), offset);
366339

367340
((numeric *)sqlda->sqlvar[i].sqldata)->buf = (NumericDigit *)sqlda + offset;
368341
((numeric *)sqlda->sqlvar[i].sqldata)->digits = (NumericDigit *)sqlda + offset + (num->digits - num->buf);
@@ -375,19 +348,16 @@ ecpg_set_compat_sqlda(int lineno, struct sqlda_compat **_sqlda, const PGresult *
375348
ecpg_sqlda_align_add_size(offset, sizeof(date), sizeof(date), &offset, &next_offset);
376349
sqlda->sqlvar[i].sqldata = (char *)sqlda + offset;
377350
sqlda->sqlvar[i].sqllen = sizeof(date);
378-
ecpg_log("%s type %s offset %d\n", __FUNCTION__, ecpg_type_name(sqlda->sqlvar[i].sqltype), offset);
379351
break;
380352
case ECPGt_timestamp:
381353
ecpg_sqlda_align_add_size(offset, sizeof(timestamp), sizeof(timestamp), &offset, &next_offset);
382354
sqlda->sqlvar[i].sqldata = (char *)sqlda + offset;
383355
sqlda->sqlvar[i].sqllen = sizeof(timestamp);
384-
ecpg_log("%s type %s offset %d\n", __FUNCTION__, ecpg_type_name(sqlda->sqlvar[i].sqltype), offset);
385356
break;
386357
case ECPGt_interval:
387358
ecpg_sqlda_align_add_size(offset, sizeof(int64_t), sizeof(interval), &offset, &next_offset);
388359
sqlda->sqlvar[i].sqldata = (char *)sqlda + offset;
389360
sqlda->sqlvar[i].sqllen = sizeof(interval);
390-
ecpg_log("%s type %s offset %d\n", __FUNCTION__, ecpg_type_name(sqlda->sqlvar[i].sqltype), offset);
391361
break;
392362
case ECPGt_char:
393363
case ECPGt_unsigned_char:
@@ -399,7 +369,6 @@ ecpg_set_compat_sqlda(int lineno, struct sqlda_compat **_sqlda, const PGresult *
399369
sqlda->sqlvar[i].sqllen = datalen;
400370
if (datalen > 32768)
401371
sqlda->sqlvar[i].sqlilongdata = sqlda->sqlvar[i].sqldata;
402-
ecpg_log("%s type %s offset %d\n", __FUNCTION__, ecpg_type_name(sqlda->sqlvar[i].sqltype), offset);
403372
break;
404373
}
405374

@@ -484,52 +453,44 @@ ecpg_set_native_sqlda(int lineno, struct sqlda_struct **_sqlda, const PGresult *
484453
ecpg_sqlda_align_add_size(offset, sizeof(short), sizeof(short), &offset, &next_offset);
485454
sqlda->sqlvar[i].sqldata = (char *)sqlda + offset;
486455
sqlda->sqlvar[i].sqllen = sizeof(short);
487-
ecpg_log("%s type %s offset %d\n", __FUNCTION__, ecpg_type_name(sqlda->sqlvar[i].sqltype), offset);
488456
break;
489457
case ECPGt_int:
490458
case ECPGt_unsigned_int:
491459
ecpg_sqlda_align_add_size(offset, sizeof(int), sizeof(int), &offset, &next_offset);
492460
sqlda->sqlvar[i].sqldata = (char *)sqlda + offset;
493461
sqlda->sqlvar[i].sqllen = sizeof(int);
494-
ecpg_log("%s type %s offset %d\n", __FUNCTION__, ecpg_type_name(sqlda->sqlvar[i].sqltype), offset);
495462
break;
496463
case ECPGt_long:
497464
case ECPGt_unsigned_long:
498465
ecpg_sqlda_align_add_size(offset, sizeof(long), sizeof(long), &offset, &next_offset);
499466
sqlda->sqlvar[i].sqldata = (char *)sqlda + offset;
500467
sqlda->sqlvar[i].sqllen = sizeof(long);
501-
ecpg_log("%s type %s offset %d\n", __FUNCTION__, ecpg_type_name(sqlda->sqlvar[i].sqltype), offset);
502468
break;
503469
case ECPGt_long_long:
504470
case ECPGt_unsigned_long_long:
505471
ecpg_sqlda_align_add_size(offset, sizeof(long long), sizeof(long long), &offset, &next_offset);
506472
sqlda->sqlvar[i].sqldata = (char *)sqlda + offset;
507473
sqlda->sqlvar[i].sqllen = sizeof(long long);
508-
ecpg_log("%s type %s offset %d\n", __FUNCTION__, ecpg_type_name(sqlda->sqlvar[i].sqltype), offset);
509474
break;
510475
case ECPGt_bool:
511476
ecpg_sqlda_align_add_size(offset, sizeof(bool), sizeof(bool), &offset, &next_offset);
512477
sqlda->sqlvar[i].sqldata = (char *)sqlda + offset;
513478
sqlda->sqlvar[i].sqllen = sizeof(bool);
514-
ecpg_log("%s type %s offset %d\n", __FUNCTION__, ecpg_type_name(sqlda->sqlvar[i].sqltype), offset);
515479
break;
516480
case ECPGt_float:
517481
ecpg_sqlda_align_add_size(offset, sizeof(float), sizeof(float), &offset, &next_offset);
518482
sqlda->sqlvar[i].sqldata = (char *)sqlda + offset;
519483
sqlda->sqlvar[i].sqllen = sizeof(float);
520-
ecpg_log("%s type %s offset %d\n", __FUNCTION__, ecpg_type_name(sqlda->sqlvar[i].sqltype), offset);
521484
break;
522485
case ECPGt_double:
523486
ecpg_sqlda_align_add_size(offset, sizeof(double), sizeof(double), &offset, &next_offset);
524487
sqlda->sqlvar[i].sqldata = (char *)sqlda + offset;
525488
sqlda->sqlvar[i].sqllen = sizeof(double);
526-
ecpg_log("%s type %s offset %d\n", __FUNCTION__, ecpg_type_name(sqlda->sqlvar[i].sqltype), offset);
527489
break;
528490
case ECPGt_decimal:
529491
ecpg_sqlda_align_add_size(offset, sizeof(int), sizeof(decimal), &offset, &next_offset);
530492
sqlda->sqlvar[i].sqldata = (char *)sqlda + offset;
531493
sqlda->sqlvar[i].sqllen = sizeof(decimal);
532-
ecpg_log("%s type %s offset %d\n", __FUNCTION__, ecpg_type_name(sqlda->sqlvar[i].sqltype), offset);
533494
break;
534495
case ECPGt_numeric:
535496
{
@@ -541,7 +502,6 @@ ecpg_set_native_sqlda(int lineno, struct sqlda_struct **_sqlda, const PGresult *
541502
ecpg_sqlda_align_add_size(offset, sizeof(int), sizeof(numeric), &offset, &next_offset);
542503
sqlda->sqlvar[i].sqldata = (char *)sqlda + offset;
543504
sqlda->sqlvar[i].sqllen = sizeof(numeric);
544-
ecpg_log("%s type %s offset1 %d\n", __FUNCTION__, ecpg_type_name(sqlda->sqlvar[i].sqltype), offset);
545505

546506
if (PQgetisnull(res, row, i))
547507
{
@@ -561,7 +521,6 @@ ecpg_set_native_sqlda(int lineno, struct sqlda_struct **_sqlda, const PGresult *
561521

562522
ecpg_sqlda_align_add_size(next_offset, sizeof(int), num->ndigits + 1, &offset, &next_offset);
563523
memcpy((char *)sqlda + offset, num->buf, num->ndigits + 1);
564-
ecpg_log("%s type %s offset2 %d\n", __FUNCTION__, ecpg_type_name(sqlda->sqlvar[i].sqltype), offset);
565524

566525
((numeric *)sqlda->sqlvar[i].sqldata)->buf = (NumericDigit *)sqlda + offset;
567526
((numeric *)sqlda->sqlvar[i].sqldata)->digits = (NumericDigit *)sqlda + offset + (num->digits - num->buf);
@@ -574,19 +533,16 @@ ecpg_set_native_sqlda(int lineno, struct sqlda_struct **_sqlda, const PGresult *
574533
ecpg_sqlda_align_add_size(offset, sizeof(date), sizeof(date), &offset, &next_offset);
575534
sqlda->sqlvar[i].sqldata = (char *)sqlda + offset;
576535
sqlda->sqlvar[i].sqllen = sizeof(date);
577-
ecpg_log("%s type %s offset %d\n", __FUNCTION__, ecpg_type_name(sqlda->sqlvar[i].sqltype), offset);
578536
break;
579537
case ECPGt_timestamp:
580538
ecpg_sqlda_align_add_size(offset, sizeof(timestamp), sizeof(timestamp), &offset, &next_offset);
581539
sqlda->sqlvar[i].sqldata = (char *)sqlda + offset;
582540
sqlda->sqlvar[i].sqllen = sizeof(timestamp);
583-
ecpg_log("%s type %s offset %d\n", __FUNCTION__, ecpg_type_name(sqlda->sqlvar[i].sqltype), offset);
584541
break;
585542
case ECPGt_interval:
586543
ecpg_sqlda_align_add_size(offset, sizeof(int64_t), sizeof(interval), &offset, &next_offset);
587544
sqlda->sqlvar[i].sqldata = (char *)sqlda + offset;
588545
sqlda->sqlvar[i].sqllen = sizeof(interval);
589-
ecpg_log("%s type %s offset %d\n", __FUNCTION__, ecpg_type_name(sqlda->sqlvar[i].sqltype), offset);
590546
break;
591547
case ECPGt_char:
592548
case ECPGt_unsigned_char:
@@ -596,7 +552,6 @@ ecpg_set_native_sqlda(int lineno, struct sqlda_struct **_sqlda, const PGresult *
596552
ecpg_sqlda_align_add_size(offset, sizeof(int), datalen, &offset, &next_offset);
597553
sqlda->sqlvar[i].sqldata = (char *)sqlda + offset;
598554
sqlda->sqlvar[i].sqllen = datalen;
599-
ecpg_log("%s type %s offset %d\n", __FUNCTION__, ecpg_type_name(sqlda->sqlvar[i].sqltype), offset);
600555
break;
601556
}
602557

0 commit comments

Comments
 (0)