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

Commit4b8378a

Browse files
author
Michael Meskes
committed
Removed compiler warnings
1 parent27458bb commit4b8378a

File tree

9 files changed

+162
-154
lines changed

9 files changed

+162
-154
lines changed

‎src/interfaces/ecpg/test/compat_informix/test_informix.pgc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#include "sqltypes.h"
2-
2+
#include <stdlib.h>
3+
#
34
$include ../regression;
45
$define NUMBER 12;
56

‎src/interfaces/ecpg/test/errors/init.pgc

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,40 +3,39 @@ exec sql include sqlca;
33
enum e { ENUM0, ENUM1 };
44
struct sa { int member; };
55

6-
int
7-
fa(void)
6+
static int fa(void)
87
{
98
printf("in fa\n");
109
return 2;
1110
}
1211

13-
int
12+
staticint
1413
fb(int x)
1514
{
1615
printf("in fb (%d)\n", x);
1716
return x;
1817
}
1918

20-
int
19+
staticint
2120
fc(const char *x)
2221
{
2322
printf("in fc (%s)\n", x);
2423
return *x;
2524
}
2625

27-
int fd(const char *x,int i)
26+
staticint fd(const char *x,int i)
2827
{
2928
printf("in fd (%s, %d)\n", x, i);
3029
return (*x)*i;
3130
}
3231

33-
int fe(enum e x)
32+
staticint fe(enum e x)
3433
{
3534
printf("in fe (%d)\n", (int) x);
3635
return (int)x;
3736
}
3837

39-
void sqlnotice(char *notice, short trans)
38+
staticvoid sqlnotice(char *notice, short trans)
4039
{
4140
if (!notice)
4241
notice = "-empty-";
@@ -56,7 +55,7 @@ namespace N
5655

5756
int main(void)
5857
{
59-
struct sa x,*y;
58+
struct sa x = { 14 },*y = &x;
6059
exec sql begin declare section;
6160
int a=(int)2;
6261
int b=2+2;
@@ -83,6 +82,9 @@ int main(void)
8382

8483
ECPGdebug(1, stderr);
8584

85+
printf("%d %d %d %d %d %d %d %d %d %d %d\n", a, b, b2, c, d, e, f, g, h, i, j);
86+
iax = iay = 0;
87+
printf("%ld %lld\n", iay, iax);
8688
exec sql whenever sqlerror do fa();
8789
exec sql select now();
8890
exec sql whenever sqlerror do fb(20);

‎src/interfaces/ecpg/test/expected/compat_informix-test_informix.c

Lines changed: 49 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010

1111
#line 1 "test_informix.pgc"
1212
#include"sqltypes.h"
13-
13+
#include<stdlib.h>
14+
#
1415

1516
#line 1 "./../regression.h"
1617

@@ -19,7 +20,7 @@
1920

2021

2122

22-
#line3 "test_informix.pgc"
23+
#line4 "test_informix.pgc"
2324

2425

2526

@@ -31,111 +32,111 @@ static void dosqlprint(void) {
3132
intmain(void)
3233
{
3334

34-
#line13 "test_informix.pgc"
35+
#line14 "test_informix.pgc"
3536
inti=14 ;
3637

37-
#line13 "test_informix.pgc"
38+
#line14 "test_informix.pgc"
3839

3940

40-
#line14 "test_informix.pgc"
41+
#line15 "test_informix.pgc"
4142
decimalj ,m ,n ;
4243

43-
#line14 "test_informix.pgc"
44+
#line15 "test_informix.pgc"
4445

4546

4647
ECPGdebug(1,stderr);
4748
/* exec sql whenever sqlerror do dosqlprint ( ) ; */
48-
#line17 "test_informix.pgc"
49+
#line18 "test_informix.pgc"
4950

5051

5152
{ECPGconnect(__LINE__,1,"regress1" ,NULL,NULL ,NULL,0);
52-
#line19 "test_informix.pgc"
53+
#line20 "test_informix.pgc"
5354

5455
if (sqlca.sqlcode<0)dosqlprint ( );}
55-
#line19 "test_informix.pgc"
56+
#line20 "test_informix.pgc"
5657

5758
if (sqlca.sqlcode!=0)exit(1);
5859

5960
{ECPGdo(__LINE__,1,1,NULL,"create table test ( i int primary key , j int ) ",ECPGt_EOIT,ECPGt_EORT);
60-
#line22 "test_informix.pgc"
61+
#line23 "test_informix.pgc"
6162

6263
if (sqlca.sqlcode<0)dosqlprint ( );}
63-
#line22 "test_informix.pgc"
64+
#line23 "test_informix.pgc"
6465

6566

6667
/* this INSERT works */
6768
rsetnull(CDECIMALTYPE, (char*)&j);
6869
{ECPGdo(__LINE__,1,1,NULL,"insert into test ( i , j ) values( 7 , ? )",
6970
ECPGt_decimal,&(j),(long)1,(long)1,sizeof(decimal),
7071
ECPGt_NO_INDICATOR,NULL ,0L,0L,0L,ECPGt_EOIT,ECPGt_EORT);
71-
#line26 "test_informix.pgc"
72+
#line27 "test_informix.pgc"
7273

7374
if (sqlca.sqlcode<0)dosqlprint ( );}
74-
#line26 "test_informix.pgc"
75+
#line27 "test_informix.pgc"
7576

7677
{ECPGtrans(__LINE__,NULL,"commit");
77-
#line27 "test_informix.pgc"
78+
#line28 "test_informix.pgc"
7879

7980
if (sqlca.sqlcode<0)dosqlprint ( );}
80-
#line27 "test_informix.pgc"
81+
#line28 "test_informix.pgc"
8182

8283

8384
/* this INSERT should fail because i is a unique column */
8485
{ECPGdo(__LINE__,1,1,NULL,"insert into test ( i , j ) values( 7 , 12 )",ECPGt_EOIT,ECPGt_EORT);
85-
#line30 "test_informix.pgc"
86+
#line31 "test_informix.pgc"
8687

8788
if (sqlca.sqlcode<0)dosqlprint ( );}
88-
#line30 "test_informix.pgc"
89+
#line31 "test_informix.pgc"
8990

9091
printf("INSERT: %ld=%s\n",sqlca.sqlcode,sqlca.sqlerrm.sqlerrmc);
9192
if (sqlca.sqlcode!=0) {ECPGtrans(__LINE__,NULL,"rollback");
92-
#line32 "test_informix.pgc"
93+
#line33 "test_informix.pgc"
9394

9495
if (sqlca.sqlcode<0)dosqlprint ( );}
95-
#line32 "test_informix.pgc"
96+
#line33 "test_informix.pgc"
9697

9798

9899
{ECPGdo(__LINE__,1,1,NULL,"insert into test ( i , j ) values( ? , 1 )",
99100
ECPGt_int,&(i),(long)1,(long)1,sizeof(int),
100101
ECPGt_NO_INDICATOR,NULL ,0L,0L,0L,ECPGt_EOIT,ECPGt_EORT);
101-
#line34 "test_informix.pgc"
102+
#line35 "test_informix.pgc"
102103

103104
if (sqlca.sqlcode<0)dosqlprint ( );}
104-
#line34 "test_informix.pgc"
105+
#line35 "test_informix.pgc"
105106

106107
{ECPGtrans(__LINE__,NULL,"commit");
107-
#line35 "test_informix.pgc"
108+
#line36 "test_informix.pgc"
108109

109110
if (sqlca.sqlcode<0)dosqlprint ( );}
110-
#line35 "test_informix.pgc"
111+
#line36 "test_informix.pgc"
111112

112113

113114
/* this will fail (more than one row in subquery) */
114115
{ECPGdo(__LINE__,1,1,NULL,"select i from test where j = ( select j from test ) ",ECPGt_EOIT,ECPGt_EORT);
115-
#line38 "test_informix.pgc"
116+
#line39 "test_informix.pgc"
116117

117118
if (sqlca.sqlcode<0)dosqlprint ( );}
118-
#line38 "test_informix.pgc"
119+
#line39 "test_informix.pgc"
119120

120121

121122
/* this however should be ok */
122123
{ECPGdo(__LINE__,1,1,NULL,"select i from test where j = ( select j from test limit 1 ) ",ECPGt_EOIT,ECPGt_EORT);
123-
#line41 "test_informix.pgc"
124+
#line42 "test_informix.pgc"
124125

125126
if (sqlca.sqlcode<0)dosqlprint ( );}
126-
#line41 "test_informix.pgc"
127+
#line42 "test_informix.pgc"
127128

128129
printf("SELECT: %ld=%s\n",sqlca.sqlcode,sqlca.sqlerrm.sqlerrmc);
129130
if (sqlca.sqlcode!=0) {ECPGtrans(__LINE__,NULL,"rollback");
130-
#line43 "test_informix.pgc"
131+
#line44 "test_informix.pgc"
131132

132133
if (sqlca.sqlcode<0)dosqlprint ( );}
133-
#line43 "test_informix.pgc"
134+
#line44 "test_informix.pgc"
134135

135136

136137
ECPG_informix_set_var(0,&(i ),__LINE__);\
137138
/* declare c cursor for select * from test where i <= ? */
138-
#line45 "test_informix.pgc"
139+
#line46 "test_informix.pgc"
139140

140141
openit();
141142

@@ -148,10 +149,10 @@ if (sqlca.sqlcode < 0) dosqlprint ( );}
148149
ECPGt_NO_INDICATOR,NULL ,0L,0L,0L,
149150
ECPGt_decimal,&(j),(long)1,(long)1,sizeof(decimal),
150151
ECPGt_NO_INDICATOR,NULL ,0L,0L,0L,ECPGt_EORT);
151-
#line52 "test_informix.pgc"
152+
#line53 "test_informix.pgc"
152153

153154
if (sqlca.sqlcode<0)dosqlprint ( );}
154-
#line52 "test_informix.pgc"
155+
#line53 "test_informix.pgc"
155156

156157
if (sqlca.sqlcode==100)break;
157158
elseif (sqlca.sqlcode!=0)printf ("Error: %ld\n",sqlca.sqlcode);
@@ -173,53 +174,53 @@ if (sqlca.sqlcode < 0) dosqlprint ( );}
173174
{ECPGdo(__LINE__,1,1,NULL,"delete from test where i = ?",
174175
ECPGt_decimal,&(n),(long)1,(long)1,sizeof(decimal),
175176
ECPGt_NO_INDICATOR,NULL ,0L,0L,0L,ECPGt_EOIT,ECPGt_EORT);
176-
#line70 "test_informix.pgc"
177+
#line71 "test_informix.pgc"
177178

178179
if (sqlca.sqlcode<0)dosqlprint ( );}
179-
#line70 "test_informix.pgc"
180+
#line71 "test_informix.pgc"
180181

181182
printf("DELETE: %ld\n",sqlca.sqlcode);
182183

183184
{ECPGdo(__LINE__,1,1,NULL,"select 1 from test where i = 14 ",ECPGt_EOIT,ECPGt_EORT);
184-
#line73 "test_informix.pgc"
185+
#line74 "test_informix.pgc"
185186

186187
if (sqlca.sqlcode<0)dosqlprint ( );}
187-
#line73 "test_informix.pgc"
188+
#line74 "test_informix.pgc"
188189

189190
printf("Exists: %ld\n",sqlca.sqlcode);
190191

191192
{ECPGdo(__LINE__,1,1,NULL,"select 1 from test where i = 147 ",ECPGt_EOIT,ECPGt_EORT);
192-
#line76 "test_informix.pgc"
193+
#line77 "test_informix.pgc"
193194

194195
if (sqlca.sqlcode<0)dosqlprint ( );}
195-
#line76 "test_informix.pgc"
196+
#line77 "test_informix.pgc"
196197

197198
printf("Does not exist: %ld\n",sqlca.sqlcode);
198199

199200
{ECPGtrans(__LINE__,NULL,"commit");
200-
#line79 "test_informix.pgc"
201+
#line80 "test_informix.pgc"
201202

202203
if (sqlca.sqlcode<0)dosqlprint ( );}
203-
#line79 "test_informix.pgc"
204+
#line80 "test_informix.pgc"
204205

205206
{ECPGdo(__LINE__,1,1,NULL,"drop table test ",ECPGt_EOIT,ECPGt_EORT);
206-
#line80 "test_informix.pgc"
207+
#line81 "test_informix.pgc"
207208

208209
if (sqlca.sqlcode<0)dosqlprint ( );}
209-
#line80 "test_informix.pgc"
210+
#line81 "test_informix.pgc"
210211

211212
{ECPGtrans(__LINE__,NULL,"commit");
212-
#line81 "test_informix.pgc"
213+
#line82 "test_informix.pgc"
213214

214215
if (sqlca.sqlcode<0)dosqlprint ( );}
215-
#line81 "test_informix.pgc"
216+
#line82 "test_informix.pgc"
216217

217218

218219
{ECPGdisconnect(__LINE__,"CURRENT");
219-
#line83 "test_informix.pgc"
220+
#line84 "test_informix.pgc"
220221

221222
if (sqlca.sqlcode<0)dosqlprint ( );}
222-
#line83 "test_informix.pgc"
223+
#line84 "test_informix.pgc"
223224

224225

225226
return0;
@@ -230,10 +231,10 @@ static void openit(void)
230231
{ECPGdo(__LINE__,1,1,NULL,"declare c cursor for select * from test where i <= ? ",
231232
ECPGt_int,&(*(int*)(ECPG_informix_get_var(0))),(long)1,(long)1,sizeof(int),
232233
ECPGt_NO_INDICATOR,NULL ,0L,0L,0L,ECPGt_EOIT,ECPGt_EORT);
233-
#line90 "test_informix.pgc"
234+
#line91 "test_informix.pgc"
234235

235236
if (sqlca.sqlcode<0)dosqlprint ( );}
236-
#line90 "test_informix.pgc"
237+
#line91 "test_informix.pgc"
237238

238239
}
239240

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp