mirror of
https://git.postgresql.org/git/postgresql.git
synced 2024-12-27 08:39:28 +08:00
Revert pgindent changes to ecpg include files that are part of ecpg
regession test output, and update pgindent script to avoid them in the future.
This commit is contained in:
parent
98c356c8ad
commit
2cc6ff45f8
@ -6,11 +6,13 @@
|
||||
#include "sqlda-compat.h"
|
||||
typedef struct sqlvar_compat sqlvar_t;
|
||||
typedef struct sqlda_compat sqlda_t;
|
||||
|
||||
#else
|
||||
|
||||
#include "sqlda-native.h"
|
||||
typedef struct sqlvar_struct sqlvar_t;
|
||||
typedef struct sqlda_struct sqlda_t;
|
||||
|
||||
#endif
|
||||
|
||||
#endif /* ECPG_SQLDA_H */
|
||||
|
@ -1,6 +1,5 @@
|
||||
|
||||
struct mytype
|
||||
{
|
||||
struct mytype {
|
||||
int id;
|
||||
char t[64];
|
||||
double d1; /* dec_t */
|
||||
@ -9,8 +8,7 @@ struct mytype
|
||||
};
|
||||
typedef struct mytype MYTYPE;
|
||||
|
||||
struct mynulltype
|
||||
{
|
||||
struct mynulltype {
|
||||
int id;
|
||||
int t;
|
||||
int d1;
|
||||
|
@ -1,4 +1,4 @@
|
||||
$PostgreSQL: pgsql/src/tools/pgindent/README,v 1.37 2010/02/26 15:57:34 momjian Exp $
|
||||
$PostgreSQL: pgsql/src/tools/pgindent/README,v 1.38 2010/02/26 17:07:55 momjian Exp $
|
||||
|
||||
pgindent
|
||||
========
|
||||
@ -20,6 +20,8 @@ This can format all PostgreSQL *.c and *.h files, but excludes *.y, and
|
||||
|
||||
find . -name '*.[ch]' -type f -print |
|
||||
egrep -v '/s_lock.h|/ecpg/test/expected/|/snowball/libstemmer/' |
|
||||
egrep -v '/ecpg/include/(sqlda|sqltypes)\.h$' |
|
||||
egrep -v '/ecpg/include/preproc/struct\.h$' |
|
||||
xargs -n100 pgindent src/tools/pgindent/typedefs.list
|
||||
|
||||
5) Remove any files that generate errors.
|
||||
@ -44,13 +46,14 @@ Notes about excluded files:
|
||||
src/include/storage/s_lock.h is excluded because it contains assembly code
|
||||
that pgindent tends to mess up.
|
||||
|
||||
src/interfaces/ecpg/test/expected/ is excluded to avoid breaking the ecpg
|
||||
regression tests.
|
||||
|
||||
src/include/snowball/libstemmer/ and src/backend/snowball/libstemmer/
|
||||
are excluded because those files are imported from an external project,
|
||||
not maintained locally, and are machine-generated anyway.
|
||||
|
||||
src/interfaces/ecpg/test/expected/ is excluded to avoid breaking the ecpg
|
||||
regression tests. Several *.h files are included in regression output so
|
||||
should not be changed.
|
||||
|
||||
---------------------------------------------------------------------------
|
||||
|
||||
Obsolete typedef list creation instructions:
|
||||
|
Loading…
Reference in New Issue
Block a user