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.

diff --git a/src/interfaces/ecpg/include/sqlda.h b/src/interfaces/ecpg/include/sqlda.h
index 3f99a463b5d58269e0e9f53afd4a3f4e28698456..b1b4debf905721a6fb794baa5b3ff0f57aa8e800 100644 (file)
--- a/src/interfaces/ecpg/include/sqlda.h
+++ b/src/interfaces/ecpg/include/sqlda.h
@@ -4,13 +4,15 @@
 #ifdef _ECPG_INFORMIX_H
 
 #include "sqlda-compat.h"
-typedef struct sqlvar_compat sqlvar_t;
-typedef struct sqlda_compat sqlda_t;
+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;
+typedef struct sqlvar_struct   sqlvar_t;
+typedef struct sqlda_struct    sqlda_t;
+
 #endif
 
-#endif   /* ECPG_SQLDA_H */
+#endif /* ECPG_SQLDA_H */

diff --git a/src/interfaces/ecpg/include/sqltypes.h b/src/interfaces/ecpg/include/sqltypes.h
index 797cb5b1be4f6514841a334fce9027f77250df95..0c01867d02fcf2a1f7ce045c3c4b0f7a0170ac2a 100644 (file)
--- a/src/interfaces/ecpg/include/sqltypes.h
+++ b/src/interfaces/ecpg/include/sqltypes.h
@@ -32,26 +32,26 @@
 /*
  * Values used in sqlda->sqlvar[i]->sqltype
  */
-#define SQLCHAR                ECPGt_char
-#define SQLSMINT       ECPGt_short
-#define SQLINT         ECPGt_int
-#define SQLFLOAT       ECPGt_double
-#define SQLSMFLOAT     ECPGt_float
-#define SQLDECIMAL     ECPGt_decimal
-#define SQLSERIAL      ECPGt_int
-#define SQLDATE                ECPGt_date
-#define SQLDTIME       ECPGt_timestamp
-#define SQLTEXT                ECPGt_char
-#define SQLVCHAR       ECPGt_char
-#define SQLINTERVAL            ECPGt_interval
-#define SQLNCHAR       ECPGt_char
-#define SQLNVCHAR      ECPGt_char
+#define        SQLCHAR         ECPGt_char
+#define        SQLSMINT        ECPGt_short
+#define        SQLINT          ECPGt_int
+#define        SQLFLOAT        ECPGt_double
+#define        SQLSMFLOAT      ECPGt_float
+#define        SQLDECIMAL      ECPGt_decimal
+#define        SQLSERIAL       ECPGt_int
+#define        SQLDATE         ECPGt_date
+#define        SQLDTIME        ECPGt_timestamp
+#define        SQLTEXT         ECPGt_char
+#define        SQLVCHAR        ECPGt_char
+#define SQLINTERVAL     ECPGt_interval
+#define        SQLNCHAR        ECPGt_char
+#define        SQLNVCHAR       ECPGt_char
 #ifdef HAVE_LONG_LONG_INT_64
-#define SQLINT8                ECPGt_long_long
-#define SQLSERIAL8     ECPGt_long_long
+#define        SQLINT8         ECPGt_long_long
+#define        SQLSERIAL8      ECPGt_long_long
 #else
-#define SQLINT8                ECPGt_long
-#define SQLSERIAL8     ECPGt_long
+#define        SQLINT8         ECPGt_long
+#define        SQLSERIAL8      ECPGt_long
 #endif
 
 #endif   /* ndef ECPG_SQLTYPES_H */

diff --git a/src/interfaces/ecpg/test/preproc/struct.h b/src/interfaces/ecpg/test/preproc/struct.h
index 75e802ac6feed9dde1ebaea509a80dece2399576..cc4681b74fefeb6926900efabf3179ec0d209fb7 100644 (file)
--- a/src/interfaces/ecpg/test/preproc/struct.h
+++ b/src/interfaces/ecpg/test/preproc/struct.h
@@ -1,20 +1,18 @@
 
-struct mytype
-{
-       int                     id;
-       char            t[64];
-       double          d1;                             /* dec_t */
-       double          d2;
-       char            c[30];
+struct mytype {
+       int     id;
+       char    t[64];
+       double  d1; /* dec_t */
+       double  d2;
+       char    c[30];
 };
 typedef struct mytype MYTYPE;
 
-struct mynulltype
-{
-       int                     id;
-       int                     t;
-       int                     d1;
-       int                     d2;
-       int                     c;
+struct mynulltype {
+       int     id;
+       int     t;
+       int     d1;
+       int     d2;
+       int     c;
 };
 typedef struct mynulltype MYNULLTYPE;

diff --git a/src/tools/pgindent/README b/src/tools/pgindent/README
index d5179c535b8e2c031fa4a09e04c5b7ad3e473479..86af4ab23f79e2cffd41573f9362a41a644c3b43 100644 (file)
--- a/src/tools/pgindent/README
+++ b/src/tools/pgindent/README
@@ -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: