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

Commit fa1a8d6

Browse files
bmomjianbmomjian
committed
OK, folks, here is the pgindent output.
1 parent af74855 commit fa1a8d6

File tree

574 files changed

+26551
-24075
lines changed

Some content is hidden

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

574 files changed

+26551
-24075
lines changed

‎src/backend/access/common/heaptuple.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.40 1998/09/01 03:20:41 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.41 1998/09/01 04:26:39 momjian Exp $
1212
*
1313
* NOTES
1414
* The old interface functions have been converted to macros
@@ -935,7 +935,8 @@ heap_modifytuple(HeapTuple tuple,
935935
(char *) &tuple->t_oid,
936936
((char *) &tuple->t_hoff - (char *) &tuple->t_oid)); /* XXX */
937937
newTuple->t_infomask = infomask;
938-
newTuple->t_natts = numberOfAttributes; /* fix t_natts just in case */
938+
newTuple->t_natts = numberOfAttributes; /* fix t_natts just in
939+
* case */
939940
return newTuple;
940941
}
941942

‎src/backend/access/common/printtup.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/access/common/printtup.c,v 1.34 1998/09/01 03:20:45 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/access/common/printtup.c,v 1.35 1998/09/01 04:26:40 momjian Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -82,8 +82,10 @@ printtup(HeapTuple tuple, TupleDesc typeinfo)
8282
Datum attr;
8383
bool isnull;
8484
Oid typoutput;
85+
8586
#ifdef MULTIBYTE
8687
unsigned char *p;
88+
8789
#endif
8890

8991
/* ----------------
@@ -147,7 +149,7 @@ printtup(HeapTuple tuple, TupleDesc typeinfo)
147149
outputstr = "<unprintable>";
148150
pq_putint(strlen(outputstr) + VARHDRSZ, VARHDRSZ);
149151
pq_putnchar(outputstr, strlen(outputstr));
150-
}
152+
}
151153
}
152154
}
153155

‎src/backend/access/common/tupdesc.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/access/common/tupdesc.c,v 1.43 1998/09/01 03:20:46 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/common/tupdesc.c,v 1.44 1998/09/01 04:26:41 momjian Exp $
1111
*
1212
* NOTES
1313
* some of the executor utility code such as "ExecTypeFromTL" should be
@@ -75,7 +75,7 @@ CreateTemplateTupleDesc(int natts)
7575
* ----------------------------------------------------------------
7676
*/
7777
TupleDesc
78-
CreateTupleDesc(int natts, Form_pg_attribute *attrs)
78+
CreateTupleDesc(int natts, Form_pg_attribute * attrs)
7979
{
8080
TupleDesc desc;
8181

‎src/backend/access/gist/gist.c

Lines changed: 16 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -33,42 +33,32 @@
3333
#endif
3434

3535
/* non-export function prototypes */
36-
static InsertIndexResult
37-
gistdoinsert(Relation r, IndexTuple itup,
36+
static InsertIndexResult gistdoinsert(Relation r, IndexTuple itup,
3837
GISTSTATE *GISTstate);
39-
static InsertIndexResult
40-
gistentryinsert(Relation r, GISTSTACK *stk,
38+
static InsertIndexResult gistentryinsert(Relation r, GISTSTACK *stk,
4139
IndexTuple tup,
4240
GISTSTATE *giststate);
43-
static void
44-
gistentryinserttwo(Relation r, GISTSTACK *stk, IndexTuple ltup,
41+
static void gistentryinserttwo(Relation r, GISTSTACK *stk, IndexTuple ltup,
4542
IndexTuple rtup, GISTSTATE *giststate);
46-
static void
47-
gistAdjustKeys(Relation r, GISTSTACK *stk, BlockNumber blk,
43+
static void gistAdjustKeys(Relation r, GISTSTACK *stk, BlockNumber blk,
4844
char *datum, int att_size, GISTSTATE *giststate);
49-
static void
50-
gistintinsert(Relation r, GISTSTACK *stk, IndexTuple ltup,
45+
static void gistintinsert(Relation r, GISTSTACK *stk, IndexTuple ltup,
5146
IndexTuple rtup, GISTSTATE *giststate);
52-
static InsertIndexResult
53-
gistSplit(Relation r, Buffer buffer,
47+
static InsertIndexResult gistSplit(Relation r, Buffer buffer,
5448
GISTSTACK *stack, IndexTuple itup,
5549
GISTSTATE *giststate);
56-
static void
57-
gistnewroot(GISTSTATE *giststate, Relation r, IndexTuple lt,
50+
static void gistnewroot(GISTSTATE *giststate, Relation r, IndexTuple lt,
5851
IndexTuple rt);
5952
static void GISTInitBuffer(Buffer b, uint32 f);
60-
static BlockNumber
61-
gistChooseSubtree(Relation r, IndexTuple itup, int level,
53+
static BlockNumber gistChooseSubtree(Relation r, IndexTuple itup, int level,
6254
GISTSTATE *giststate,
6355
GISTSTACK **retstack, Buffer *leafbuf);
64-
static OffsetNumber
65-
gistchoose(Relation r, Page p, IndexTuple it,
56+
static OffsetNumber gistchoose(Relation r, Page p, IndexTuple it,
6657
GISTSTATE *giststate);
6758
static int gistnospace(Page p, IndexTuple it);
6859
void gistdelete(Relation r, ItemPointer tid);
6960
static IndexTuple gist_tuple_replacekey(Relation r, GISTENTRY entry, IndexTuple t);
70-
static void
71-
gistcentryinit(GISTSTATE *giststate, GISTENTRY *e, char *pr,
61+
static void gistcentryinit(GISTSTATE *giststate, GISTENTRY *e, char *pr,
7262
Relation r, Page pg, OffsetNumber o, int b, bool l);
7363
static char *int_range_out(INTRANGE *r);
7464

@@ -169,7 +159,7 @@ gistbuild(Relation heap,
169159
slot = NULL;
170160
econtext = NULL;
171161
}
172-
#endif /* OMIT_PARTIAL_INDEX */
162+
#endif /* OMIT_PARTIAL_INDEX */
173163
/* int the tuples as we insert them */
174164
nh = ni = 0;
175165

@@ -193,7 +183,7 @@ gistbuild(Relation heap,
193183
ni++;
194184
continue;
195185
}
196-
#endif /* OMIT_PARTIAL_INDEX */
186+
#endif /* OMIT_PARTIAL_INDEX */
197187
}
198188

199189
/*
@@ -207,7 +197,7 @@ gistbuild(Relation heap,
207197
slot->val = htup;
208198
if (ExecQual((List *) pred, econtext) == false)
209199
continue;
210-
#endif /* OMIT_PARTIAL_INDEX */
200+
#endif /* OMIT_PARTIAL_INDEX */
211201
}
212202

213203
ni++;
@@ -286,7 +276,7 @@ gistbuild(Relation heap,
286276
#ifndef OMIT_PARTIAL_INDEX
287277
ExecDestroyTupleTable(tupleTable, true);
288278
pfree(econtext);
289-
#endif /* OMIT_PARTIAL_INDEX */
279+
#endif /* OMIT_PARTIAL_INDEX */
290280
}
291281

292282
/*
@@ -1168,7 +1158,7 @@ initGISTstate(GISTSTATE *giststate, Relation index)
11681158
itupform = (Form_pg_index) GETSTRUCT(htup);
11691159
if (!HeapTupleIsValid(htup))
11701160
elog(ERROR, "initGISTstate: index %d not found",
1171-
RelationGetRelid(index));
1161+
RelationGetRelid(index));
11721162
giststate->haskeytype = itupform->indhaskeytype;
11731163
if (giststate->haskeytype)
11741164
{
@@ -1377,4 +1367,4 @@ int_range_out(INTRANGE *r)
13771367
return result;
13781368
}
13791369

1380-
#endif /* defined GISTDEBUG */
1370+
#endif /* defined GISTDEBUG */

‎src/backend/access/gist/gistget.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,13 @@
2828
#endif
2929

3030

31-
static OffsetNumber
32-
gistfindnext(IndexScanDesc s, Page p, OffsetNumber n,
31+
static OffsetNumber gistfindnext(IndexScanDesc s, Page p, OffsetNumber n,
3332
ScanDirection dir);
3433
static RetrieveIndexResult gistscancache(IndexScanDesc s, ScanDirection dir);
3534
static RetrieveIndexResult gistfirst(IndexScanDesc s, ScanDirection dir);
3635
static RetrieveIndexResult gistnext(IndexScanDesc s, ScanDirection dir);
3736
static ItemPointer gistheapptr(Relation r, ItemPointer itemp);
38-
static bool
39-
gistindex_keytest(IndexTuple tuple, TupleDesc tupdesc,
37+
static bool gistindex_keytest(IndexTuple tuple, TupleDesc tupdesc,
4038
int scanKeySize, ScanKey key, GISTSTATE *giststate,
4139
Relation r, Page p, OffsetNumber offset);
4240

‎src/backend/access/gist/gistscan.c

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,11 @@
2929
/* routines defined and used here */
3030
static void gistregscan(IndexScanDesc s);
3131
static void gistdropscan(IndexScanDesc s);
32-
static void
33-
gistadjone(IndexScanDesc s, int op, BlockNumber blkno,
32+
static void gistadjone(IndexScanDesc s, int op, BlockNumber blkno,
3433
OffsetNumber offnum);
35-
static void
36-
adjuststack(GISTSTACK *stk, BlockNumber blkno,
34+
static void adjuststack(GISTSTACK *stk, BlockNumber blkno,
3735
OffsetNumber offnum);
38-
static void
39-
adjustiptr(IndexScanDesc s, ItemPointer iptr,
36+
static void adjustiptr(IndexScanDesc s, ItemPointer iptr,
4037
int op, BlockNumber blkno, OffsetNumber offnum);
4138

4239
/*

‎src/backend/access/hash/hash.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/access/hash/hash.c,v 1.21 1998/09/01 03:20:53 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/hash/hash.c,v 1.22 1998/09/01 04:26:48 momjian Exp $
1111
*
1212
* NOTES
1313
* This file contains only the public interface routines.
@@ -118,7 +118,7 @@ hashbuild(Relation heap,
118118
tupleTable = 0;
119119
slot = 0;
120120
}
121-
#endif /* OMIT_PARTIAL_INDEX */
121+
#endif /* OMIT_PARTIAL_INDEX */
122122

123123
/* build the index */
124124
nhtups = nitups = 0;
@@ -145,7 +145,7 @@ hashbuild(Relation heap,
145145
nitups++;
146146
continue;
147147
}
148-
#endif /* OMIT_PARTIAL_INDEX */
148+
#endif /* OMIT_PARTIAL_INDEX */
149149
}
150150

151151
/*
@@ -159,7 +159,7 @@ hashbuild(Relation heap,
159159
slot->val = htup;
160160
if (ExecQual((List *) pred, econtext) == false)
161161
continue;
162-
#endif /* OMIT_PARTIAL_INDEX */
162+
#endif /* OMIT_PARTIAL_INDEX */
163163
}
164164

165165
nitups++;
@@ -232,7 +232,7 @@ hashbuild(Relation heap,
232232
#ifndef OMIT_PARTIAL_INDEX
233233
ExecDestroyTupleTable(tupleTable, true);
234234
pfree(econtext);
235-
#endif /* OMIT_PARTIAL_INDEX */
235+
#endif /* OMIT_PARTIAL_INDEX */
236236
}
237237

238238
/*

‎src/backend/access/hash/hashfunc.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/access/hash/hashfunc.c,v 1.11 1998/09/01 03:20:54 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/hash/hashfunc.c,v 1.12 1998/09/01 04:26:49 momjian Exp $
1111
*
1212
* NOTES
1313
* These functions are stored in pg_amproc. For each operator class
@@ -136,11 +136,11 @@ hashoid(Oid key)
136136
uint32
137137
hashoid8(Oid *key)
138138
{
139-
int i;
140-
uint32 result = 0;
139+
int i;
140+
uint32 result = 0;
141141

142-
for (i=0; i < 8; i++)
143-
result = result ^ (~(uint32)key[i]);
142+
for (i = 0; i < 8; i++)
143+
result = result ^ (~(uint32) key[i]);
144144
return result;
145145
}
146146

0 commit comments

Comments
 (0)