Skip to content

Commit 1dc3498

Browse files
bmomjianbmomjian
committed
Standard pgindent run for 8.1.
1 parent 790c01d commit 1dc3498

File tree

770 files changed

+34394
-32567
lines changed

Some content is hidden

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

770 files changed

+34394
-32567
lines changed

‎contrib/btree_gist/btree_cash.c

+5-5
Original file line numberDiff line numberDiff line change
@@ -125,10 +125,10 @@ Datum
125125
gbt_cash_penalty(PG_FUNCTION_ARGS)
126126
{
127127
cashKEY *origentry = (cashKEY *) DatumGetPointer(((GISTENTRY *) PG_GETARG_POINTER(0))->key);
128-
cashKEY *newentry = (cashKEY *) DatumGetPointer(((GISTENTRY *) PG_GETARG_POINTER(1))->key);
129-
float *result = (float *) PG_GETARG_POINTER(2);
128+
cashKEY *newentry = (cashKEY *) DatumGetPointer(((GISTENTRY *) PG_GETARG_POINTER(1))->key);
129+
float *result = (float *) PG_GETARG_POINTER(2);
130130

131-
penalty_num(result,origentry->lower,origentry->upper,newentry->lower,newentry->upper);
131+
penalty_num(result, origentry->lower, origentry->upper, newentry->lower, newentry->upper);
132132

133133
PG_RETURN_POINTER(result);
134134

@@ -138,8 +138,8 @@ Datum
138138
gbt_cash_picksplit(PG_FUNCTION_ARGS)
139139
{
140140
PG_RETURN_POINTER(gbt_num_picksplit(
141-
(GistEntryVector *) PG_GETARG_POINTER(0),
142-
(GIST_SPLITVEC *) PG_GETARG_POINTER(1),
141+
(GistEntryVector *) PG_GETARG_POINTER(0),
142+
(GIST_SPLITVEC *) PG_GETARG_POINTER(1),
143143
&tinfo
144144
));
145145
}

‎contrib/btree_gist/btree_date.c

+8-8
Original file line numberDiff line numberDiff line change
@@ -148,15 +148,15 @@ gbt_date_penalty(PG_FUNCTION_ARGS)
148148

149149
diff = DatumGetInt32(DirectFunctionCall2(
150150
date_mi,
151-
DateADTGetDatum(newentry->upper),
152-
DateADTGetDatum(origentry->upper)));
151+
DateADTGetDatum(newentry->upper),
152+
DateADTGetDatum(origentry->upper)));
153153

154154
res = Max(diff, 0);
155155

156156
diff = DatumGetInt32(DirectFunctionCall2(
157157
date_mi,
158-
DateADTGetDatum(origentry->lower),
159-
DateADTGetDatum(newentry->lower)));
158+
DateADTGetDatum(origentry->lower),
159+
DateADTGetDatum(newentry->lower)));
160160

161161
res += Max(diff, 0);
162162

@@ -166,8 +166,8 @@ gbt_date_penalty(PG_FUNCTION_ARGS)
166166
{
167167
diff = DatumGetInt32(DirectFunctionCall2(
168168
date_mi,
169-
DateADTGetDatum(origentry->upper),
170-
DateADTGetDatum(origentry->lower)));
169+
DateADTGetDatum(origentry->upper),
170+
DateADTGetDatum(origentry->lower)));
171171
*result += FLT_MIN;
172172
*result += (float) (res / ((double) (res + diff)));
173173
*result *= (FLT_MAX / (((GISTENTRY *) PG_GETARG_POINTER(0))->rel->rd_att->natts + 1));
@@ -181,8 +181,8 @@ Datum
181181
gbt_date_picksplit(PG_FUNCTION_ARGS)
182182
{
183183
PG_RETURN_POINTER(gbt_num_picksplit(
184-
(GistEntryVector *) PG_GETARG_POINTER(0),
185-
(GIST_SPLITVEC *) PG_GETARG_POINTER(1),
184+
(GistEntryVector *) PG_GETARG_POINTER(0),
185+
(GIST_SPLITVEC *) PG_GETARG_POINTER(1),
186186
&tinfo
187187
));
188188
}

‎contrib/btree_gist/btree_float4.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ gbt_float4_penalty(PG_FUNCTION_ARGS)
127127
float4KEY *newentry = (float4KEY *) DatumGetPointer(((GISTENTRY *) PG_GETARG_POINTER(1))->key);
128128
float *result = (float *) PG_GETARG_POINTER(2);
129129

130-
penalty_num(result,origentry->lower,origentry->upper,newentry->lower,newentry->upper);
130+
penalty_num(result, origentry->lower, origentry->upper, newentry->lower, newentry->upper);
131131

132132
PG_RETURN_POINTER(result);
133133

@@ -137,8 +137,8 @@ Datum
137137
gbt_float4_picksplit(PG_FUNCTION_ARGS)
138138
{
139139
PG_RETURN_POINTER(gbt_num_picksplit(
140-
(GistEntryVector *) PG_GETARG_POINTER(0),
141-
(GIST_SPLITVEC *) PG_GETARG_POINTER(1),
140+
(GistEntryVector *) PG_GETARG_POINTER(0),
141+
(GIST_SPLITVEC *) PG_GETARG_POINTER(1),
142142
&tinfo
143143
));
144144
}

‎contrib/btree_gist/btree_float8.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ gbt_float8_penalty(PG_FUNCTION_ARGS)
129129
float8KEY *newentry = (float8KEY *) DatumGetPointer(((GISTENTRY *) PG_GETARG_POINTER(1))->key);
130130
float *result = (float *) PG_GETARG_POINTER(2);
131131

132-
penalty_num(result,origentry->lower,origentry->upper,newentry->lower,newentry->upper);
132+
penalty_num(result, origentry->lower, origentry->upper, newentry->lower, newentry->upper);
133133

134134
PG_RETURN_POINTER(result);
135135

@@ -139,8 +139,8 @@ Datum
139139
gbt_float8_picksplit(PG_FUNCTION_ARGS)
140140
{
141141
PG_RETURN_POINTER(gbt_num_picksplit(
142-
(GistEntryVector *) PG_GETARG_POINTER(0),
143-
(GIST_SPLITVEC *) PG_GETARG_POINTER(1),
142+
(GistEntryVector *) PG_GETARG_POINTER(0),
143+
(GIST_SPLITVEC *) PG_GETARG_POINTER(1),
144144
&tinfo
145145
));
146146
}

‎contrib/btree_gist/btree_inet.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -194,8 +194,8 @@ gbt_inet_penalty(PG_FUNCTION_ARGS)
194194
inetKEY *newentry = (inetKEY *) DatumGetPointer(((GISTENTRY *) PG_GETARG_POINTER(1))->key);
195195
float *result = (float *) PG_GETARG_POINTER(2);
196196

197-
penalty_num(result,origentry->lower,origentry->upper,newentry->lower,newentry->upper);
198-
197+
penalty_num(result, origentry->lower, origentry->upper, newentry->lower, newentry->upper);
198+
199199
PG_RETURN_POINTER(result);
200200

201201
}
@@ -204,8 +204,8 @@ Datum
204204
gbt_inet_picksplit(PG_FUNCTION_ARGS)
205205
{
206206
PG_RETURN_POINTER(gbt_num_picksplit(
207-
(GistEntryVector *) PG_GETARG_POINTER(0),
208-
(GIST_SPLITVEC *) PG_GETARG_POINTER(1),
207+
(GistEntryVector *) PG_GETARG_POINTER(0),
208+
(GIST_SPLITVEC *) PG_GETARG_POINTER(1),
209209
&tinfo
210210
));
211211
}

‎contrib/btree_gist/btree_int2.c

+5-5
Original file line numberDiff line numberDiff line change
@@ -128,10 +128,10 @@ Datum
128128
gbt_int2_penalty(PG_FUNCTION_ARGS)
129129
{
130130
int16KEY *origentry = (int16KEY *) DatumGetPointer(((GISTENTRY *) PG_GETARG_POINTER(0))->key);
131-
int16KEY *newentry = (int16KEY *) DatumGetPointer(((GISTENTRY *) PG_GETARG_POINTER(1))->key);
132-
float *result = (float *) PG_GETARG_POINTER(2);
131+
int16KEY *newentry = (int16KEY *) DatumGetPointer(((GISTENTRY *) PG_GETARG_POINTER(1))->key);
132+
float *result = (float *) PG_GETARG_POINTER(2);
133133

134-
penalty_num(result,origentry->lower,origentry->upper,newentry->lower,newentry->upper);
134+
penalty_num(result, origentry->lower, origentry->upper, newentry->lower, newentry->upper);
135135

136136
PG_RETURN_POINTER(result);
137137
}
@@ -140,8 +140,8 @@ Datum
140140
gbt_int2_picksplit(PG_FUNCTION_ARGS)
141141
{
142142
PG_RETURN_POINTER(gbt_num_picksplit(
143-
(GistEntryVector *) PG_GETARG_POINTER(0),
144-
(GIST_SPLITVEC *) PG_GETARG_POINTER(1),
143+
(GistEntryVector *) PG_GETARG_POINTER(0),
144+
(GIST_SPLITVEC *) PG_GETARG_POINTER(1),
145145
&tinfo
146146
));
147147
}

‎contrib/btree_gist/btree_int4.c

+6-6
Original file line numberDiff line numberDiff line change
@@ -126,10 +126,10 @@ Datum
126126
gbt_int4_penalty(PG_FUNCTION_ARGS)
127127
{
128128
int32KEY *origentry = (int32KEY *) DatumGetPointer(((GISTENTRY *) PG_GETARG_POINTER(0))->key);
129-
int32KEY *newentry = (int32KEY *) DatumGetPointer(((GISTENTRY *) PG_GETARG_POINTER(1))->key);
130-
float *result = (float *) PG_GETARG_POINTER(2);
131-
132-
penalty_num(result,origentry->lower,origentry->upper,newentry->lower,newentry->upper);
129+
int32KEY *newentry = (int32KEY *) DatumGetPointer(((GISTENTRY *) PG_GETARG_POINTER(1))->key);
130+
float *result = (float *) PG_GETARG_POINTER(2);
131+
132+
penalty_num(result, origentry->lower, origentry->upper, newentry->lower, newentry->upper);
133133

134134
PG_RETURN_POINTER(result);
135135
}
@@ -138,8 +138,8 @@ Datum
138138
gbt_int4_picksplit(PG_FUNCTION_ARGS)
139139
{
140140
PG_RETURN_POINTER(gbt_num_picksplit(
141-
(GistEntryVector *) PG_GETARG_POINTER(0),
142-
(GIST_SPLITVEC *) PG_GETARG_POINTER(1),
141+
(GistEntryVector *) PG_GETARG_POINTER(0),
142+
(GIST_SPLITVEC *) PG_GETARG_POINTER(1),
143143
&tinfo
144144
));
145145
}

‎contrib/btree_gist/btree_int8.c

+6-6
Original file line numberDiff line numberDiff line change
@@ -125,20 +125,20 @@ Datum
125125
gbt_int8_penalty(PG_FUNCTION_ARGS)
126126
{
127127
int64KEY *origentry = (int64KEY *) DatumGetPointer(((GISTENTRY *) PG_GETARG_POINTER(0))->key);
128-
int64KEY *newentry = (int64KEY *) DatumGetPointer(((GISTENTRY *) PG_GETARG_POINTER(1))->key);
129-
float *result = (float *) PG_GETARG_POINTER(2);
128+
int64KEY *newentry = (int64KEY *) DatumGetPointer(((GISTENTRY *) PG_GETARG_POINTER(1))->key);
129+
float *result = (float *) PG_GETARG_POINTER(2);
130+
131+
penalty_num(result, origentry->lower, origentry->upper, newentry->lower, newentry->upper);
130132

131-
penalty_num(result,origentry->lower,origentry->upper,newentry->lower,newentry->upper);
132-
133133
PG_RETURN_POINTER(result);
134134
}
135135

136136
Datum
137137
gbt_int8_picksplit(PG_FUNCTION_ARGS)
138138
{
139139
PG_RETURN_POINTER(gbt_num_picksplit(
140-
(GistEntryVector *) PG_GETARG_POINTER(0),
141-
(GIST_SPLITVEC *) PG_GETARG_POINTER(1),
140+
(GistEntryVector *) PG_GETARG_POINTER(0),
141+
(GIST_SPLITVEC *) PG_GETARG_POINTER(1),
142142
&tinfo
143143
));
144144
}

‎contrib/btree_gist/btree_interval.c

+6-6
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ gbt_intvkey_cmp(const void *a, const void *b)
6363
{
6464
return DatumGetInt32(
6565
DirectFunctionCall2(interval_cmp,
66-
IntervalPGetDatum(((Nsrt *) a)->t),
67-
IntervalPGetDatum(((Nsrt *) b)->t)
66+
IntervalPGetDatum(((Nsrt *) a)->t),
67+
IntervalPGetDatum(((Nsrt *) b)->t)
6868
)
6969
);
7070
}
@@ -78,7 +78,7 @@ intr2num(const Interval *i)
7878

7979
/*
8080
* INTERVALSIZE should be the actual size-on-disk of an Interval, as shown
81-
* in pg_type. This might be less than sizeof(Interval) if the compiler
81+
* in pg_type. This might be less than sizeof(Interval) if the compiler
8282
* insists on adding alignment padding at the end of the struct.
8383
*/
8484
#define INTERVALSIZE 16
@@ -202,7 +202,7 @@ gbt_intv_penalty(PG_FUNCTION_ARGS)
202202
inew[0] = intr2num(&newentry->lower);
203203
inew[1] = intr2num(&newentry->upper);
204204

205-
penalty_num(result,iorg[0],iorg[1],inew[0],inew[1]);
205+
penalty_num(result, iorg[0], iorg[1], inew[0], inew[1]);
206206

207207
PG_RETURN_POINTER(result);
208208

@@ -212,8 +212,8 @@ Datum
212212
gbt_intv_picksplit(PG_FUNCTION_ARGS)
213213
{
214214
PG_RETURN_POINTER(gbt_num_picksplit(
215-
(GistEntryVector *) PG_GETARG_POINTER(0),
216-
(GIST_SPLITVEC *) PG_GETARG_POINTER(1),
215+
(GistEntryVector *) PG_GETARG_POINTER(0),
216+
(GIST_SPLITVEC *) PG_GETARG_POINTER(1),
217217
&tinfo
218218
));
219219
}

‎contrib/btree_gist/btree_macaddr.c

+5-5
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ gbt_macadkey_cmp(const void *a, const void *b)
6363
return DatumGetInt32(
6464
DirectFunctionCall2(
6565
macaddr_cmp,
66-
PointerGetDatum(&((Nsrt *) a)->t[0]),
67-
PointerGetDatum(&((Nsrt *) b)->t[0])
66+
PointerGetDatum(&((Nsrt *) a)->t[0]),
67+
PointerGetDatum(&((Nsrt *) b)->t[0])
6868
)
6969
);
7070
}
@@ -157,7 +157,7 @@ gbt_macad_penalty(PG_FUNCTION_ARGS)
157157
inew[0] = mac_2_uint64(&newentry->lower);
158158
inew[1] = mac_2_uint64(&newentry->upper);
159159

160-
penalty_num(result,iorg[0],iorg[1],inew[0],inew[1]);
160+
penalty_num(result, iorg[0], iorg[1], inew[0], inew[1]);
161161

162162
PG_RETURN_POINTER(result);
163163

@@ -167,8 +167,8 @@ Datum
167167
gbt_macad_picksplit(PG_FUNCTION_ARGS)
168168
{
169169
PG_RETURN_POINTER(gbt_num_picksplit(
170-
(GistEntryVector *) PG_GETARG_POINTER(0),
171-
(GIST_SPLITVEC *) PG_GETARG_POINTER(1),
170+
(GistEntryVector *) PG_GETARG_POINTER(0),
171+
(GIST_SPLITVEC *) PG_GETARG_POINTER(1),
172172
&tinfo
173173
));
174174
}

‎contrib/btree_gist/btree_oid.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ gbt_oid_penalty(PG_FUNCTION_ARGS)
129129
oidKEY *newentry = (oidKEY *) DatumGetPointer(((GISTENTRY *) PG_GETARG_POINTER(1))->key);
130130
float *result = (float *) PG_GETARG_POINTER(2);
131131

132-
penalty_num(result,origentry->lower,origentry->upper,newentry->lower,newentry->upper);
132+
penalty_num(result, origentry->lower, origentry->upper, newentry->lower, newentry->upper);
133133

134134
PG_RETURN_POINTER(result);
135135
}
@@ -138,8 +138,8 @@ Datum
138138
gbt_oid_picksplit(PG_FUNCTION_ARGS)
139139
{
140140
PG_RETURN_POINTER(gbt_num_picksplit(
141-
(GistEntryVector *) PG_GETARG_POINTER(0),
142-
(GIST_SPLITVEC *) PG_GETARG_POINTER(1),
141+
(GistEntryVector *) PG_GETARG_POINTER(0),
142+
(GIST_SPLITVEC *) PG_GETARG_POINTER(1),
143143
&tinfo
144144
));
145145
}

‎contrib/btree_gist/btree_text.c

+5-5
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ gbt_text_compress(PG_FUNCTION_ARGS)
8787
{
8888
GISTENTRY *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
8989

90-
if ( tinfo.eml == 0 )
90+
if (tinfo.eml == 0)
9191
{
9292
tinfo.eml = pg_database_encoding_max_length();
9393
}
@@ -102,7 +102,7 @@ gbt_bpchar_compress(PG_FUNCTION_ARGS)
102102
GISTENTRY *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
103103
GISTENTRY *retval;
104104

105-
if ( tinfo.eml == 0 )
105+
if (tinfo.eml == 0)
106106
{
107107
tinfo.eml = pg_database_encoding_max_length();
108108
}
@@ -111,7 +111,7 @@ gbt_bpchar_compress(PG_FUNCTION_ARGS)
111111
{
112112

113113
Datum d = DirectFunctionCall1(rtrim1, entry->key);
114-
GISTENTRY trim;
114+
GISTENTRY trim;
115115

116116
gistentryinit(trim, d,
117117
entry->rel, entry->page,
@@ -136,7 +136,7 @@ gbt_text_consistent(PG_FUNCTION_ARGS)
136136
bool retval = FALSE;
137137
GBT_VARKEY_R r = gbt_var_key_readable(key);
138138

139-
if ( tinfo.eml == 0 )
139+
if (tinfo.eml == 0)
140140
{
141141
tinfo.eml = pg_database_encoding_max_length();
142142
}
@@ -158,7 +158,7 @@ gbt_bpchar_consistent(PG_FUNCTION_ARGS)
158158
bool retval;
159159
GBT_VARKEY_R r = gbt_var_key_readable(key);
160160

161-
if ( tinfo.eml == 0 )
161+
if (tinfo.eml == 0)
162162
{
163163
tinfo.eml = pg_database_encoding_max_length();
164164
}

0 commit comments

Comments
 (0)