Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commitdb58e8f

Browse files
author
Michael Meskes
committed
ECPG: Free the malloc()'ed variables in the test so it comes out clean on
Valgrind runs.Patch by Boszormenyi Zoltan <zb@cybertec.at>
1 parentb46fa32 commitdb58e8f

File tree

3 files changed

+16
-10
lines changed

3 files changed

+16
-10
lines changed

‎src/interfaces/ecpg/test/expected/preproc-outofscope.c

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -347,28 +347,31 @@ if (sqlca.sqlcode < 0) exit (1);}
347347

348348
close_cur1();
349349

350+
free(myvar);
351+
free(mynullvar);
352+
350353
strcpy(msg,"drop");
351354
{ECPGdo(__LINE__,0,1,NULL,0,ECPGst_normal,"drop table a1",ECPGt_EOIT,ECPGt_EORT);
352-
#line115 "outofscope.pgc"
355+
#line118 "outofscope.pgc"
353356

354357
if (sqlca.sqlcode<0)exit (1);}
355-
#line115 "outofscope.pgc"
358+
#line118 "outofscope.pgc"
356359

357360

358361
strcpy(msg,"commit");
359362
{ECPGtrans(__LINE__,NULL,"commit");
360-
#line118 "outofscope.pgc"
363+
#line121 "outofscope.pgc"
361364

362365
if (sqlca.sqlcode<0)exit (1);}
363-
#line118 "outofscope.pgc"
366+
#line121 "outofscope.pgc"
364367

365368

366369
strcpy(msg,"disconnect");
367370
{ECPGdisconnect(__LINE__,"CURRENT");
368-
#line121 "outofscope.pgc"
371+
#line124 "outofscope.pgc"
369372

370373
if (sqlca.sqlcode<0)exit (1);}
371-
#line121 "outofscope.pgc"
374+
#line124 "outofscope.pgc"
372375

373376

374377
return (0);

‎src/interfaces/ecpg/test/expected/preproc-outofscope.stderr

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,13 +102,13 @@
102102
[NO_PID]: sqlca: code: 0, state: 00000
103103
[NO_PID]: ecpg_execute on line 58: OK: CLOSE CURSOR
104104
[NO_PID]: sqlca: code: 0, state: 00000
105-
[NO_PID]: ecpg_execute on line115: query: drop table a1; with 0 parameter(s) on connection regress1
105+
[NO_PID]: ecpg_execute on line118: query: drop table a1; with 0 parameter(s) on connection regress1
106106
[NO_PID]: sqlca: code: 0, state: 00000
107-
[NO_PID]: ecpg_execute on line115: using PQexec
107+
[NO_PID]: ecpg_execute on line118: using PQexec
108108
[NO_PID]: sqlca: code: 0, state: 00000
109-
[NO_PID]: ecpg_execute on line115: OK: DROP TABLE
109+
[NO_PID]: ecpg_execute on line118: OK: DROP TABLE
110110
[NO_PID]: sqlca: code: 0, state: 00000
111-
[NO_PID]: ECPGtrans on line118: action "commit"; connection "regress1"
111+
[NO_PID]: ECPGtrans on line121: action "commit"; connection "regress1"
112112
[NO_PID]: sqlca: code: 0, state: 00000
113113
[NO_PID]: ecpg_finish: connection regress1 closed
114114
[NO_PID]: sqlca: code: 0, state: 00000

‎src/interfaces/ecpg/test/preproc/outofscope.pgc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,9 @@ main (void)
111111

112112
close_cur1();
113113

114+
free(myvar);
115+
free(mynullvar);
116+
114117
strcpy(msg, "drop");
115118
exec sql drop table a1;
116119

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp