Skip to content

Commit 84288a8

Browse files
bmomjianbmomjian
committed
With ecpg exclusion removed, re-run pgindent for 9.4
Report by Tom Lane
1 parent 9516668 commit 84288a8

File tree

7 files changed

+65
-65
lines changed

7 files changed

+65
-65
lines changed

‎src/backend/utils/adt/jsonb_util.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -953,10 +953,10 @@ JsonbDeepContains(JsonbIterator **val, JsonbIterator **mContained)
953953
* arrays.
954954
*
955955
* A raw scalar may contain another raw scalar, and an array may
956-
* contain a raw scalar, but a raw scalar may not contain an array.
957-
* We don't do something like this for the object case, since objects
958-
* can only contain pairs, never raw scalars (a pair is represented by
959-
* an rhs object argument with a single contained pair).
956+
* contain a raw scalar, but a raw scalar may not contain an array. We
957+
* don't do something like this for the object case, since objects can
958+
* only contain pairs, never raw scalars (a pair is represented by an
959+
* rhs object argument with a single contained pair).
960960
*/
961961
if (vval.val.array.rawScalar && !vcontained.val.array.rawScalar)
962962
return false;

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

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

66
#include "sqlda-compat.h"
7-
typedef struct sqlvar_compat sqlvar_t;
8-
typedef struct sqlda_compat sqlda_t;
7+
typedef struct sqlvar_compat sqlvar_t;
8+
typedef struct sqlda_compat sqlda_t;
99

1010
#else
1111

1212
#include "sqlda-native.h"
13-
typedef struct sqlvar_struct sqlvar_t;
14-
typedef struct sqlda_struct sqlda_t;
13+
typedef struct sqlvar_struct sqlvar_t;
14+
typedef struct sqlda_struct sqlda_t;
1515

1616
#endif
1717

18-
#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-
#define SQLCHAR ECPGt_char
36-
#define SQLSMINT ECPGt_short
37-
#define SQLINT ECPGt_int
38-
#define SQLFLOAT ECPGt_double
39-
#define SQLSMFLOAT ECPGt_float
40-
#define SQLDECIMAL ECPGt_decimal
41-
#define SQLSERIAL ECPGt_int
42-
#define SQLDATE ECPGt_date
43-
#define SQLDTIME ECPGt_timestamp
44-
#define SQLTEXT ECPGt_char
45-
#define SQLVCHAR ECPGt_char
46-
#define SQLINTERVAL ECPGt_interval
47-
#define SQLNCHAR ECPGt_char
48-
#define SQLNVCHAR ECPGt_char
35+
#define SQLCHAR ECPGt_char
36+
#define SQLSMINT ECPGt_short
37+
#define SQLINT ECPGt_int
38+
#define SQLFLOAT ECPGt_double
39+
#define SQLSMFLOAT ECPGt_float
40+
#define SQLDECIMAL ECPGt_decimal
41+
#define SQLSERIAL ECPGt_int
42+
#define SQLDATE ECPGt_date
43+
#define SQLDTIME ECPGt_timestamp
44+
#define SQLTEXT ECPGt_char
45+
#define SQLVCHAR ECPGt_char
46+
#define SQLINTERVAL ECPGt_interval
47+
#define SQLNCHAR ECPGt_char
48+
#define SQLNVCHAR ECPGt_char
4949
#ifdef HAVE_LONG_LONG_INT_64
50-
#define SQLINT8 ECPGt_long_long
51-
#define SQLSERIAL8 ECPGt_long_long
50+
#define SQLINT8 ECPGt_long_long
51+
#define SQLSERIAL8 ECPGt_long_long
5252
#else
53-
#define SQLINT8 ECPGt_long
54-
#define SQLSERIAL8 ECPGt_long
53+
#define SQLINT8 ECPGt_long
54+
#define SQLSERIAL8 ECPGt_long
5555
#endif
5656

5757
#endif /* ndef ECPG_SQLTYPES_H */

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,18 +30,18 @@
3030
#ifdef _ECPG_INFORMIX_H
3131

3232
#include "sqlda-compat.h"
33-
typedef struct sqlvar_compat sqlvar_t;
34-
typedef struct sqlda_compat sqlda_t;
33+
typedef struct sqlvar_compat sqlvar_t;
34+
typedef struct sqlda_compat sqlda_t;
3535

3636
#else
3737

3838
#include "sqlda-native.h"
39-
typedef struct sqlvar_struct sqlvar_t;
40-
typedef struct sqlda_struct sqlda_t;
39+
typedef struct sqlvar_struct sqlvar_t;
40+
typedef struct sqlda_struct sqlda_t;
4141

4242
#endif
4343

44-
#endif /* ECPG_SQLDA_H */
44+
#endif /* ECPG_SQLDA_H */
4545

4646
#line 5 "describe.pgc"
4747

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

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -32,18 +32,18 @@
3232
#ifdef _ECPG_INFORMIX_H
3333

3434
#include "sqlda-compat.h"
35-
typedef struct sqlvar_compat sqlvar_t;
36-
typedef struct sqlda_compat sqlda_t;
35+
typedef struct sqlvar_compat sqlvar_t;
36+
typedef struct sqlda_compat sqlda_t;
3737

3838
#else
3939

4040
#include "sqlda-native.h"
41-
typedef struct sqlvar_struct sqlvar_t;
42-
typedef struct sqlda_struct sqlda_t;
41+
typedef struct sqlvar_struct sqlvar_t;
42+
typedef struct sqlda_struct sqlda_t;
4343

4444
#endif
4545

46-
#endif /* ECPG_SQLDA_H */
46+
#endif /* ECPG_SQLDA_H */
4747

4848
#line 7 "sqlda.pgc"
4949

@@ -83,26 +83,26 @@ typedef struct sqlda_struct sqlda_t;
8383
/*
8484
* Values used in sqlda->sqlvar[i]->sqltype
8585
*/
86-
#define SQLCHAR ECPGt_char
87-
#define SQLSMINT ECPGt_short
88-
#define SQLINT ECPGt_int
89-
#define SQLFLOAT ECPGt_double
90-
#define SQLSMFLOAT ECPGt_float
91-
#define SQLDECIMAL ECPGt_decimal
92-
#define SQLSERIAL ECPGt_int
93-
#define SQLDATE ECPGt_date
94-
#define SQLDTIME ECPGt_timestamp
95-
#define SQLTEXT ECPGt_char
96-
#define SQLVCHAR ECPGt_char
97-
#define SQLINTERVAL ECPGt_interval
98-
#define SQLNCHAR ECPGt_char
99-
#define SQLNVCHAR ECPGt_char
86+
#define SQLCHAR ECPGt_char
87+
#define SQLSMINT ECPGt_short
88+
#define SQLINT ECPGt_int
89+
#define SQLFLOAT ECPGt_double
90+
#define SQLSMFLOAT ECPGt_float
91+
#define SQLDECIMAL ECPGt_decimal
92+
#define SQLSERIAL ECPGt_int
93+
#define SQLDATE ECPGt_date
94+
#define SQLDTIME ECPGt_timestamp
95+
#define SQLTEXT ECPGt_char
96+
#define SQLVCHAR ECPGt_char
97+
#define SQLINTERVAL ECPGt_interval
98+
#define SQLNCHAR ECPGt_char
99+
#define SQLNVCHAR ECPGt_char
100100
#ifdef HAVE_LONG_LONG_INT_64
101-
#define SQLINT8 ECPGt_long_long
102-
#define SQLSERIAL8 ECPGt_long_long
101+
#define SQLINT8 ECPGt_long_long
102+
#define SQLSERIAL8 ECPGt_long_long
103103
#else
104-
#define SQLINT8 ECPGt_long
105-
#define SQLSERIAL8 ECPGt_long
104+
#define SQLINT8 ECPGt_long
105+
#define SQLSERIAL8 ECPGt_long
106106
#endif
107107

108108
#endif /* ndef ECPG_SQLTYPES_H */

‎src/interfaces/ecpg/test/expected/sql-describe.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,18 @@
2828
#ifdef _ECPG_INFORMIX_H
2929

3030
#include "sqlda-compat.h"
31-
typedef struct sqlvar_compat sqlvar_t;
32-
typedef struct sqlda_compat sqlda_t;
31+
typedef struct sqlvar_compat sqlvar_t;
32+
typedef struct sqlda_compat sqlda_t;
3333

3434
#else
3535

3636
#include "sqlda-native.h"
37-
typedef struct sqlvar_struct sqlvar_t;
38-
typedef struct sqlda_struct sqlda_t;
37+
typedef struct sqlvar_struct sqlvar_t;
38+
typedef struct sqlda_struct sqlda_t;
3939

4040
#endif
4141

42-
#endif /* ECPG_SQLDA_H */
42+
#endif /* ECPG_SQLDA_H */
4343

4444
#line 5 "describe.pgc"
4545

‎src/interfaces/ecpg/test/expected/sql-sqlda.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,18 +30,18 @@
3030
#ifdef _ECPG_INFORMIX_H
3131

3232
#include "sqlda-compat.h"
33-
typedef struct sqlvar_compat sqlvar_t;
34-
typedef struct sqlda_compat sqlda_t;
33+
typedef struct sqlvar_compat sqlvar_t;
34+
typedef struct sqlda_compat sqlda_t;
3535

3636
#else
3737

3838
#include "sqlda-native.h"
39-
typedef struct sqlvar_struct sqlvar_t;
40-
typedef struct sqlda_struct sqlda_t;
39+
typedef struct sqlvar_struct sqlvar_t;
40+
typedef struct sqlda_struct sqlda_t;
4141

4242
#endif
4343

44-
#endif /* ECPG_SQLDA_H */
44+
#endif /* ECPG_SQLDA_H */
4545

4646
#line 7 "sqlda.pgc"
4747

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy