Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 65e806c

Browse files
bmomjianbmomjian
committed
pgindent run for 9.0
1 parent 1604057 commit 65e806c

File tree

403 files changed

+6779
-6523
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

403 files changed

+6779
-6523
lines changed

‎contrib/auto_explain/auto_explain.c

+8-8
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Copyright (c) 2008-2010, PostgreSQL Global Development Group
77
*
88
* IDENTIFICATION
9-
* $PostgreSQL: pgsql/contrib/auto_explain/auto_explain.c,v 1.13 2010/02/16 22:19:59 adunstan Exp $
9+
* $PostgreSQL: pgsql/contrib/auto_explain/auto_explain.c,v 1.14 2010/02/26 02:00:31 momjian Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -27,11 +27,11 @@ static int auto_explain_log_format = EXPLAIN_FORMAT_TEXT;
2727
static bool auto_explain_log_nested_statements = false;
2828

2929
static const struct config_enum_entry format_options[] = {
30-
{"text", EXPLAIN_FORMAT_TEXT, false},
31-
{"xml", EXPLAIN_FORMAT_XML, false},
32-
{"json", EXPLAIN_FORMAT_JSON, false},
33-
{"yaml", EXPLAIN_FORMAT_YAML, false},
34-
{NULL, 0, false}
30+
{"text", EXPLAIN_FORMAT_TEXT, false},
31+
{"xml", EXPLAIN_FORMAT_XML, false},
32+
{"json", EXPLAIN_FORMAT_JSON, false},
33+
{"yaml", EXPLAIN_FORMAT_YAML, false},
34+
{NULL, 0, false}
3535
};
3636

3737
/* Current nesting depth of ExecutorRun calls */
@@ -231,7 +231,7 @@ explain_ExecutorEnd(QueryDesc *queryDesc)
231231
msec = queryDesc->totaltime->total * 1000.0;
232232
if (msec >= auto_explain_log_min_duration)
233233
{
234-
ExplainState es;
234+
ExplainState es;
235235

236236
ExplainInitState(&es);
237237
es.analyze = (queryDesc->instrument_options && auto_explain_log_analyze);
@@ -257,7 +257,7 @@ explain_ExecutorEnd(QueryDesc *queryDesc)
257257
ereport(LOG,
258258
(errmsg("duration: %.3f ms plan:\n%s",
259259
msec, es.str->data),
260-
errhidestmt(true)));
260+
errhidestmt(true)));
261261

262262
pfree(es.str->data);
263263
}

‎contrib/btree_gist/btree_cash.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* $PostgreSQL: pgsql/contrib/btree_gist/btree_cash.c,v 1.10 2009/12/02 13:13:24 teodor Exp $
2+
* $PostgreSQL: pgsql/contrib/btree_gist/btree_cash.c,v 1.11 2010/02/26 02:00:31 momjian Exp $
33
*/
44
#include "btree_gist.h"
55
#include "btree_utils_num.h"
@@ -57,8 +57,8 @@ gbt_cashlt(const void *a, const void *b)
5757
static int
5858
gbt_cashkey_cmp(const void *a, const void *b)
5959
{
60-
cashKEY *ia = (cashKEY*)(((Nsrt *) a)->t);
61-
cashKEY *ib = (cashKEY*)(((Nsrt *) b)->t);
60+
cashKEY *ia = (cashKEY *) (((Nsrt *) a)->t);
61+
cashKEY *ib = (cashKEY *) (((Nsrt *) b)->t);
6262

6363
if (ia->lower == ib->lower)
6464
{

‎contrib/btree_gist/btree_date.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* $PostgreSQL: pgsql/contrib/btree_gist/btree_date.c,v 1.8 2009/12/02 13:13:24 teodor Exp $
2+
* $PostgreSQL: pgsql/contrib/btree_gist/btree_date.c,v 1.9 2010/02/26 02:00:31 momjian Exp $
33
*/
44
#include "btree_gist.h"
55
#include "btree_utils_num.h"
@@ -73,9 +73,9 @@ gbt_datelt(const void *a, const void *b)
7373
static int
7474
gbt_datekey_cmp(const void *a, const void *b)
7575
{
76-
dateKEY *ia = (dateKEY*)(((Nsrt *) a)->t);
77-
dateKEY *ib = (dateKEY*)(((Nsrt *) b)->t);
78-
int res;
76+
dateKEY *ia = (dateKEY *) (((Nsrt *) a)->t);
77+
dateKEY *ib = (dateKEY *) (((Nsrt *) b)->t);
78+
int res;
7979

8080
res = DatumGetInt32(DirectFunctionCall2(date_cmp, DateADTGetDatum(ia->lower), DateADTGetDatum(ib->lower)));
8181
if (res == 0)

‎contrib/btree_gist/btree_float4.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* $PostgreSQL: pgsql/contrib/btree_gist/btree_float4.c,v 1.9 2009/12/02 13:13:24 teodor Exp $
2+
* $PostgreSQL: pgsql/contrib/btree_gist/btree_float4.c,v 1.10 2010/02/26 02:00:31 momjian Exp $
33
*/
44
#include "btree_gist.h"
55
#include "btree_utils_num.h"
@@ -56,8 +56,8 @@ gbt_float4lt(const void *a, const void *b)
5656
static int
5757
gbt_float4key_cmp(const void *a, const void *b)
5858
{
59-
float4KEY *ia = (float4KEY*)(((Nsrt *) a)->t);
60-
float4KEY *ib = (float4KEY*)(((Nsrt *) b)->t);
59+
float4KEY *ia = (float4KEY *) (((Nsrt *) a)->t);
60+
float4KEY *ib = (float4KEY *) (((Nsrt *) b)->t);
6161

6262
if (ia->lower == ib->lower)
6363
{

‎contrib/btree_gist/btree_float8.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* $PostgreSQL: pgsql/contrib/btree_gist/btree_float8.c,v 1.9 2009/12/02 13:13:24 teodor Exp $
2+
* $PostgreSQL: pgsql/contrib/btree_gist/btree_float8.c,v 1.10 2010/02/26 02:00:31 momjian Exp $
33
*/
44
#include "btree_gist.h"
55
#include "btree_utils_num.h"
@@ -57,8 +57,8 @@ gbt_float8lt(const void *a, const void *b)
5757
static int
5858
gbt_float8key_cmp(const void *a, const void *b)
5959
{
60-
float8KEY *ia = (float8KEY*)(((Nsrt *) a)->t);
61-
float8KEY *ib = (float8KEY*)(((Nsrt *) b)->t);
60+
float8KEY *ia = (float8KEY *) (((Nsrt *) a)->t);
61+
float8KEY *ib = (float8KEY *) (((Nsrt *) b)->t);
6262

6363
if (ia->lower == ib->lower)
6464
{

‎contrib/btree_gist/btree_inet.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* $PostgreSQL: pgsql/contrib/btree_gist/btree_inet.c,v 1.11 2009/12/02 13:13:24 teodor Exp $
2+
* $PostgreSQL: pgsql/contrib/btree_gist/btree_inet.c,v 1.12 2010/02/26 02:00:31 momjian Exp $
33
*/
44
#include "btree_gist.h"
55
#include "btree_utils_num.h"
@@ -60,8 +60,8 @@ gbt_inetlt(const void *a, const void *b)
6060
static int
6161
gbt_inetkey_cmp(const void *a, const void *b)
6262
{
63-
inetKEY *ia = (inetKEY*)(((Nsrt *) a)->t);
64-
inetKEY *ib = (inetKEY*)(((Nsrt *) b)->t);
63+
inetKEY *ia = (inetKEY *) (((Nsrt *) a)->t);
64+
inetKEY *ib = (inetKEY *) (((Nsrt *) b)->t);
6565

6666
if (ia->lower == ib->lower)
6767
{

‎contrib/btree_gist/btree_int2.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* $PostgreSQL: pgsql/contrib/btree_gist/btree_int2.c,v 1.9 2009/12/02 13:13:24 teodor Exp $
2+
* $PostgreSQL: pgsql/contrib/btree_gist/btree_int2.c,v 1.10 2010/02/26 02:00:31 momjian Exp $
33
*/
44
#include "btree_gist.h"
55
#include "btree_utils_num.h"
@@ -56,8 +56,8 @@ gbt_int2lt(const void *a, const void *b)
5656
static int
5757
gbt_int2key_cmp(const void *a, const void *b)
5858
{
59-
int16KEY *ia = (int16KEY*)(((Nsrt *) a)->t);
60-
int16KEY *ib = (int16KEY*)(((Nsrt *) b)->t);
59+
int16KEY *ia = (int16KEY *) (((Nsrt *) a)->t);
60+
int16KEY *ib = (int16KEY *) (((Nsrt *) b)->t);
6161

6262
if (ia->lower == ib->lower)
6363
{

‎contrib/btree_gist/btree_int4.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* $PostgreSQL: pgsql/contrib/btree_gist/btree_int4.c,v 1.9 2009/12/02 13:13:24 teodor Exp $
2+
* $PostgreSQL: pgsql/contrib/btree_gist/btree_int4.c,v 1.10 2010/02/26 02:00:31 momjian Exp $
33
*/
44
#include "btree_gist.h"
55
#include "btree_utils_num.h"
@@ -57,8 +57,8 @@ gbt_int4lt(const void *a, const void *b)
5757
static int
5858
gbt_int4key_cmp(const void *a, const void *b)
5959
{
60-
int32KEY *ia = (int32KEY*)(((Nsrt *) a)->t);
61-
int32KEY *ib = (int32KEY*)(((Nsrt *) b)->t);
60+
int32KEY *ia = (int32KEY *) (((Nsrt *) a)->t);
61+
int32KEY *ib = (int32KEY *) (((Nsrt *) b)->t);
6262

6363
if (ia->lower == ib->lower)
6464
{

‎contrib/btree_gist/btree_int8.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* $PostgreSQL: pgsql/contrib/btree_gist/btree_int8.c,v 1.9 2009/12/02 13:13:24 teodor Exp $
2+
* $PostgreSQL: pgsql/contrib/btree_gist/btree_int8.c,v 1.10 2010/02/26 02:00:31 momjian Exp $
33
*/
44
#include "btree_gist.h"
55
#include "btree_utils_num.h"
@@ -57,8 +57,8 @@ gbt_int8lt(const void *a, const void *b)
5757
static int
5858
gbt_int8key_cmp(const void *a, const void *b)
5959
{
60-
int64KEY *ia = (int64KEY*)(((Nsrt *) a)->t);
61-
int64KEY *ib = (int64KEY*)(((Nsrt *) b)->t);
60+
int64KEY *ia = (int64KEY *) (((Nsrt *) a)->t);
61+
int64KEY *ib = (int64KEY *) (((Nsrt *) b)->t);
6262

6363
if (ia->lower == ib->lower)
6464
{

‎contrib/btree_gist/btree_interval.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* $PostgreSQL: pgsql/contrib/btree_gist/btree_interval.c,v 1.13 2009/12/02 13:13:24 teodor Exp $
2+
* $PostgreSQL: pgsql/contrib/btree_gist/btree_interval.c,v 1.14 2010/02/26 02:00:31 momjian Exp $
33
*/
44
#include "btree_gist.h"
55
#include "btree_utils_num.h"
@@ -65,9 +65,9 @@ gbt_intvlt(const void *a, const void *b)
6565
static int
6666
gbt_intvkey_cmp(const void *a, const void *b)
6767
{
68-
intvKEY *ia = (intvKEY*)(((Nsrt *) a)->t);
69-
intvKEY *ib = (intvKEY*)(((Nsrt *) b)->t);
70-
int res;
68+
intvKEY *ia = (intvKEY *) (((Nsrt *) a)->t);
69+
intvKEY *ib = (intvKEY *) (((Nsrt *) b)->t);
70+
int res;
7171

7272
res = DatumGetInt32(DirectFunctionCall2(interval_cmp, IntervalPGetDatum(&ia->lower), IntervalPGetDatum(&ib->lower)));
7373
if (res == 0)

‎contrib/btree_gist/btree_macaddr.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* $PostgreSQL: pgsql/contrib/btree_gist/btree_macaddr.c,v 1.9 2009/12/02 13:13:24 teodor Exp $
2+
* $PostgreSQL: pgsql/contrib/btree_gist/btree_macaddr.c,v 1.10 2010/02/26 02:00:31 momjian Exp $
33
*/
44
#include "btree_gist.h"
55
#include "btree_utils_num.h"
@@ -63,9 +63,9 @@ gbt_macadlt(const void *a, const void *b)
6363
static int
6464
gbt_macadkey_cmp(const void *a, const void *b)
6565
{
66-
macKEY *ia = (macKEY*)(((Nsrt *) a)->t);
67-
macKEY *ib = (macKEY*)(((Nsrt *) b)->t);
68-
int res;
66+
macKEY *ia = (macKEY *) (((Nsrt *) a)->t);
67+
macKEY *ib = (macKEY *) (((Nsrt *) b)->t);
68+
int res;
6969

7070
res = DatumGetInt32(DirectFunctionCall2(macaddr_cmp, MacaddrPGetDatum(&ia->lower), MacaddrPGetDatum(&ib->lower)));
7171
if (res == 0)

‎contrib/btree_gist/btree_oid.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* $PostgreSQL: pgsql/contrib/btree_gist/btree_oid.c,v 1.9 2009/12/02 13:13:24 teodor Exp $
2+
* $PostgreSQL: pgsql/contrib/btree_gist/btree_oid.c,v 1.10 2010/02/26 02:00:31 momjian Exp $
33
*/
44
#include "btree_gist.h"
55
#include "btree_utils_num.h"
@@ -57,8 +57,8 @@ gbt_oidlt(const void *a, const void *b)
5757
static int
5858
gbt_oidkey_cmp(const void *a, const void *b)
5959
{
60-
oidKEY *ia = (oidKEY*)(((Nsrt *) a)->t);
61-
oidKEY *ib = (oidKEY*)(((Nsrt *) b)->t);
60+
oidKEY *ia = (oidKEY *) (((Nsrt *) a)->t);
61+
oidKEY *ib = (oidKEY *) (((Nsrt *) b)->t);
6262

6363
if (ia->lower == ib->lower)
6464
{

‎contrib/btree_gist/btree_time.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* $PostgreSQL: pgsql/contrib/btree_gist/btree_time.c,v 1.17 2009/12/02 13:13:24 teodor Exp $
2+
* $PostgreSQL: pgsql/contrib/btree_gist/btree_time.c,v 1.18 2010/02/26 02:00:31 momjian Exp $
33
*/
44
#include "btree_gist.h"
55
#include "btree_utils_num.h"
@@ -101,9 +101,9 @@ gbt_timelt(const void *a, const void *b)
101101
static int
102102
gbt_timekey_cmp(const void *a, const void *b)
103103
{
104-
timeKEY *ia = (timeKEY*)(((Nsrt *) a)->t);
105-
timeKEY *ib = (timeKEY*)(((Nsrt *) b)->t);
106-
int res;
104+
timeKEY *ia = (timeKEY *) (((Nsrt *) a)->t);
105+
timeKEY *ib = (timeKEY *) (((Nsrt *) b)->t);
106+
int res;
107107

108108
res = DatumGetInt32(DirectFunctionCall2(time_cmp, TimeADTGetDatumFast(ia->lower), TimeADTGetDatumFast(ib->lower)));
109109
if (res == 0)

‎contrib/btree_gist/btree_ts.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* $PostgreSQL: pgsql/contrib/btree_gist/btree_ts.c,v 1.18 2009/12/02 13:13:24 teodor Exp $
2+
* $PostgreSQL: pgsql/contrib/btree_gist/btree_ts.c,v 1.19 2010/02/26 02:00:32 momjian Exp $
33
*/
44
#include "btree_gist.h"
55
#include "btree_utils_num.h"
@@ -99,9 +99,9 @@ gbt_tslt(const void *a, const void *b)
9999
static int
100100
gbt_tskey_cmp(const void *a, const void *b)
101101
{
102-
tsKEY *ia = (tsKEY*)(((Nsrt *) a)->t);
103-
tsKEY *ib = (tsKEY*)(((Nsrt *) b)->t);
104-
int res;
102+
tsKEY *ia = (tsKEY *) (((Nsrt *) a)->t);
103+
tsKEY *ib = (tsKEY *) (((Nsrt *) b)->t);
104+
int res;
105105

106106
res = DatumGetInt32(DirectFunctionCall2(timestamp_cmp, TimestampGetDatumFast(ia->lower), TimestampGetDatumFast(ib->lower)));
107107
if (res == 0)

‎contrib/btree_gist/btree_utils_var.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* $PostgreSQL: pgsql/contrib/btree_gist/btree_utils_var.c,v 1.22 2009/12/02 13:13:24 teodor Exp $
2+
* $PostgreSQL: pgsql/contrib/btree_gist/btree_utils_var.c,v 1.23 2010/02/26 02:00:32 momjian Exp $
33
*/
44
#include "btree_gist.h"
55

@@ -444,7 +444,7 @@ gbt_vsrt_cmp(const void *a, const void *b, void *arg)
444444
GBT_VARKEY_R ar = gbt_var_key_readable(((const Vsrt *) a)->t);
445445
GBT_VARKEY_R br = gbt_var_key_readable(((const Vsrt *) b)->t);
446446
const gbtree_vinfo *tinfo = (const gbtree_vinfo *) arg;
447-
int res;
447+
int res;
448448

449449
res = (*tinfo->f_cmp) (ar.lower, br.lower);
450450
if (res == 0)

0 commit comments

Comments
 (0)