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

Commit 089003f

Browse files
bmomjianbmomjian
committed
pgindent run.
1 parent 63354a0 commit 089003f

File tree

554 files changed

+25000
-21357
lines changed

Some content is hidden

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

554 files changed

+25000
-21357
lines changed

‎contrib/btree_gist/btree_common.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#include "btree_gist.h"
22

33
PG_FUNCTION_INFO_V1(btree_decompress);
4-
Datum btree_decompress(PG_FUNCTION_ARGS);
4+
Datum btree_decompress(PG_FUNCTION_ARGS);
55

66
/*
77
** GiST DeCompress methods

‎contrib/btree_gist/btree_gist.h

-1
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,3 @@ typedef struct rix
2323

2424
extern GIST_SPLITVEC *btree_picksplit(bytea *entryvec, GIST_SPLITVEC *v,
2525
BINARY_UNION bu, CMPFUNC cmp);
26-

‎contrib/cube/cube.c

+42-34
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ extern int cube_yyparse();
2828
NDBOX *cube_in(char *str);
2929
NDBOX *cube(text *str);
3030
char *cube_out(NDBOX * cube);
31-
NDBOX *cube_f8(double *);
32-
NDBOX *cube_f8_f8(double *, double *);
33-
NDBOX *cube_c_f8(NDBOX *, double *);
34-
NDBOX *cube_c_f8_f8(NDBOX *, double *, double *);
35-
int4 cube_dim(NDBOX * a);
31+
NDBOX *cube_f8(double *);
32+
NDBOX *cube_f8_f8(double *, double *);
33+
NDBOX *cube_c_f8(NDBOX *, double *);
34+
NDBOX *cube_c_f8_f8(NDBOX *, double *, double *);
35+
int4 cube_dim(NDBOX * a);
3636
double *cube_ll_coord(NDBOX * a, int4 n);
3737
double *cube_ur_coord(NDBOX * a, int4 n);
3838

@@ -123,15 +123,16 @@ cube_out(NDBOX * cube)
123123
bool equal = true;
124124
int dim = cube->dim;
125125
int i;
126-
int ndig;
126+
int ndig;
127127

128128
initStringInfo(&buf);
129129

130130
/*
131131
* Get the number of digits to display.
132132
*/
133133
ndig = DBL_DIG + extra_float_digits;
134-
if (ndig < 1) ndig = 1;
134+
if (ndig < 1)
135+
ndig = 1;
135136

136137
/*
137138
* while printing the first (LL) corner, check if it is equal to the
@@ -1192,7 +1193,8 @@ cube_enlarge(NDBOX * a, double *r, int4 n)
11921193
j,
11931194
k;
11941195

1195-
if (n > CUBE_MAX_DIM) n = CUBE_MAX_DIM;
1196+
if (n > CUBE_MAX_DIM)
1197+
n = CUBE_MAX_DIM;
11961198
if (*r > 0 && n > 0)
11971199
dim = n;
11981200
if (a->dim > dim)
@@ -1234,14 +1236,15 @@ NDBOX *
12341236
cube_f8(double *x1)
12351237
{
12361238
NDBOX *result;
1237-
int size;
1239+
int size;
1240+
12381241
size = offsetof(NDBOX, x[0]) + sizeof(double) * 2;
12391242
result = (NDBOX *) palloc(size);
12401243
memset(result, 0, size);
12411244
result->size = size;
12421245
result->dim = 1;
1243-
result->x[0] = *x1;
1244-
result->x[1] = *x1;
1246+
result->x[0] = *x1;
1247+
result->x[1] = *x1;
12451248
return result;
12461249
}
12471250

@@ -1250,56 +1253,61 @@ NDBOX *
12501253
cube_f8_f8(double *x1, double *x2)
12511254
{
12521255
NDBOX *result;
1253-
int size;
1256+
int size;
1257+
12541258
size = offsetof(NDBOX, x[0]) + sizeof(double) * 2;
12551259
result = (NDBOX *) palloc(size);
12561260
memset(result, 0, size);
12571261
result->size = size;
12581262
result->dim = 1;
1259-
result->x[0] = *x1;
1260-
result->x[1] = *x2;
1263+
result->x[0] = *x1;
1264+
result->x[1] = *x2;
12611265
return result;
12621266
}
12631267

12641268
/* Add a dimension to an existing cube with the same values for the new
12651269
coordinate */
12661270
NDBOX *
1267-
cube_c_f8(NDBOX *c, double *x1)
1271+
cube_c_f8(NDBOX * c, double *x1)
12681272
{
12691273
NDBOX *result;
1270-
int size;
1271-
int i;
1272-
size = offsetof(NDBOX, x[0]) + sizeof(double) * (c->dim + 1) * 2;
1274+
int size;
1275+
int i;
1276+
1277+
size = offsetof(NDBOX, x[0]) + sizeof(double) * (c->dim + 1) *2;
12731278
result = (NDBOX *) palloc(size);
12741279
memset(result, 0, size);
12751280
result->size = size;
12761281
result->dim = c->dim + 1;
1277-
for (i = 0; i < c->dim; i++) {
1278-
result->x[i] = c->x[i];
1279-
result->x[result->dim + i] = c->x[c->dim + i];
1280-
}
1281-
result->x[result->dim - 1] = *x1;
1282-
result->x[2 * result->dim - 1] = *x1;
1282+
for (i = 0; i < c->dim; i++)
1283+
{
1284+
result->x[i] = c->x[i];
1285+
result->x[result->dim + i] = c->x[c->dim + i];
1286+
}
1287+
result->x[result->dim - 1] = *x1;
1288+
result->x[2 * result->dim - 1] = *x1;
12831289
return result;
12841290
}
12851291

12861292
/* Add a dimension to an existing cube */
12871293
NDBOX *
1288-
cube_c_f8_f8(NDBOX *c, double *x1, double *x2)
1294+
cube_c_f8_f8(NDBOX * c, double *x1, double *x2)
12891295
{
12901296
NDBOX *result;
1291-
int size;
1292-
int i;
1293-
size = offsetof(NDBOX, x[0]) + sizeof(double) * (c->dim + 1) * 2;
1297+
int size;
1298+
int i;
1299+
1300+
size = offsetof(NDBOX, x[0]) + sizeof(double) * (c->dim + 1) *2;
12941301
result = (NDBOX *) palloc(size);
12951302
memset(result, 0, size);
12961303
result->size = size;
12971304
result->dim = c->dim + 1;
1298-
for (i = 0; i < c->dim; i++) {
1299-
result->x[i] = c->x[i];
1300-
result->x[result->dim + i] = c->x[c->dim + i];
1301-
}
1302-
result->x[result->dim - 1] = *x1;
1303-
result->x[2 * result->dim - 1] = *x2;
1305+
for (i = 0; i < c->dim; i++)
1306+
{
1307+
result->x[i] = c->x[i];
1308+
result->x[result->dim + i] = c->x[c->dim + i];
1309+
}
1310+
result->x[result->dim - 1] = *x1;
1311+
result->x[2 * result->dim - 1] = *x2;
13041312
return result;
13051313
}

‎contrib/dbase/dbf2pg.c

+4-6
Original file line numberDiff line numberDiff line change
@@ -443,17 +443,15 @@ do_inserts(PGconn *conn, char *table, dbhead * dbh)
443443
if (result == DBF_VALID)
444444
{
445445
query[0] = '\0';
446-
j = 0; /* counter for fields in the output */
446+
j = 0; /* counter for fields in the output */
447447
for (h = 0; h < dbh->db_nfields; h++)
448448
{
449-
if (!strlen(fields[h].db_name)) /* When the new fieldname is empty, the field is skipped */
450-
{
449+
if (!strlen(fields[h].db_name)) /* When the new fieldname
450+
* is empty, the field is
451+
* skipped */
451452
continue;
452-
}
453453
else
454-
{
455454
j++;
456-
}
457455

458456
if (j > 1) /* not for the first field! */
459457
strcat(query, "\t"); /* COPY statement field

0 commit comments

Comments
 (0)