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

Commit2cc6ff4

Browse files
committed
Revert pgindent changes to ecpg include files that are part of ecpg
regession test output, and update pgindent script to avoid them in thefuture.
1 parent98c356c commit2cc6ff4

File tree

4 files changed

+44
-41
lines changed

4 files changed

+44
-41
lines changed

‎src/interfaces/ecpg/include/sqlda.h

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,15 @@
44
#ifdef_ECPG_INFORMIX_H
55

66
#include"sqlda-compat.h"
7-
typedefstructsqlvar_compatsqlvar_t;
8-
typedefstructsqlda_compatsqlda_t;
7+
typedefstructsqlvar_compatsqlvar_t;
8+
typedefstructsqlda_compatsqlda_t;
9+
910
#else
1011

1112
#include"sqlda-native.h"
12-
typedefstructsqlvar_structsqlvar_t;
13-
typedefstructsqlda_structsqlda_t;
13+
typedefstructsqlvar_structsqlvar_t;
14+
typedefstructsqlda_structsqlda_t;
15+
1416
#endif
1517

16-
#endif/* ECPG_SQLDA_H */
18+
#endif/* ECPG_SQLDA_H */

‎src/interfaces/ecpg/include/sqltypes.h

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -32,26 +32,26 @@
3232
/*
3333
* Values used in sqlda->sqlvar[i]->sqltype
3434
*/
35-
#defineSQLCHARECPGt_char
36-
#defineSQLSMINTECPGt_short
37-
#defineSQLINTECPGt_int
38-
#defineSQLFLOATECPGt_double
39-
#defineSQLSMFLOATECPGt_float
40-
#defineSQLDECIMALECPGt_decimal
41-
#defineSQLSERIALECPGt_int
42-
#defineSQLDATEECPGt_date
43-
#defineSQLDTIMEECPGt_timestamp
44-
#defineSQLTEXTECPGt_char
45-
#defineSQLVCHARECPGt_char
46-
#defineSQLINTERVALECPGt_interval
47-
#defineSQLNCHARECPGt_char
48-
#defineSQLNVCHARECPGt_char
35+
#defineSQLCHARECPGt_char
36+
#defineSQLSMINTECPGt_short
37+
#defineSQLINTECPGt_int
38+
#defineSQLFLOATECPGt_double
39+
#defineSQLSMFLOATECPGt_float
40+
#defineSQLDECIMALECPGt_decimal
41+
#defineSQLSERIALECPGt_int
42+
#defineSQLDATEECPGt_date
43+
#defineSQLDTIMEECPGt_timestamp
44+
#defineSQLTEXTECPGt_char
45+
#defineSQLVCHARECPGt_char
46+
#defineSQLINTERVALECPGt_interval
47+
#defineSQLNCHARECPGt_char
48+
#defineSQLNVCHARECPGt_char
4949
#ifdefHAVE_LONG_LONG_INT_64
50-
#defineSQLINT8ECPGt_long_long
51-
#defineSQLSERIAL8ECPGt_long_long
50+
#defineSQLINT8ECPGt_long_long
51+
#defineSQLSERIAL8ECPGt_long_long
5252
#else
53-
#defineSQLINT8ECPGt_long
54-
#defineSQLSERIAL8ECPGt_long
53+
#defineSQLINT8ECPGt_long
54+
#defineSQLSERIAL8ECPGt_long
5555
#endif
5656

5757
#endif/* ndef ECPG_SQLTYPES_H */
Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,18 @@
11

2-
structmytype
3-
{
4-
intid;
5-
chart[64];
6-
doubled1;/* dec_t */
7-
doubled2;
8-
charc[30];
2+
structmytype {
3+
intid;
4+
chart[64];
5+
doubled1;/* dec_t */
6+
doubled2;
7+
charc[30];
98
};
109
typedefstructmytypeMYTYPE;
1110

12-
structmynulltype
13-
{
14-
intid;
15-
intt;
16-
intd1;
17-
intd2;
18-
intc;
11+
structmynulltype {
12+
intid;
13+
intt;
14+
intd1;
15+
intd2;
16+
intc;
1917
};
2018
typedefstructmynulltypeMYNULLTYPE;

‎src/tools/pgindent/README

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
$PostgreSQL: pgsql/src/tools/pgindent/README,v 1.37 2010/02/2615:57:34 momjian Exp $
1+
$PostgreSQL: pgsql/src/tools/pgindent/README,v 1.38 2010/02/2617:07:55 momjian Exp $
22

33
pgindent
44
========
@@ -20,6 +20,8 @@ This can format all PostgreSQL *.c and *.h files, but excludes *.y, and
2020

2121
find . -name '*.[ch]' -type f -print |
2222
egrep -v '/s_lock.h|/ecpg/test/expected/|/snowball/libstemmer/' |
23+
egrep -v '/ecpg/include/(sqlda|sqltypes)\.h$' |
24+
egrep -v '/ecpg/include/preproc/struct\.h$' |
2325
xargs -n100 pgindent src/tools/pgindent/typedefs.list
2426

2527
5) Remove any files that generate errors.
@@ -44,13 +46,14 @@ Notes about excluded files:
4446
src/include/storage/s_lock.h is excluded because it contains assembly code
4547
that pgindent tends to mess up.
4648

47-
src/interfaces/ecpg/test/expected/ is excluded to avoid breaking the ecpg
48-
regression tests.
49-
5049
src/include/snowball/libstemmer/ and src/backend/snowball/libstemmer/
5150
are excluded because those files are imported from an external project,
5251
not maintained locally, and are machine-generated anyway.
5352

53+
src/interfaces/ecpg/test/expected/ is excluded to avoid breaking the ecpg
54+
regression tests. Several *.h files are included in regression output so
55+
should not be changed.
56+
5457
---------------------------------------------------------------------------
5558

5659
Obsolete typedef list creation instructions:

0 commit comments

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