Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitf6e8730

Browse files
committed
Re-run pgindent with updated list of typedefs. (Updated README should
avoid this problem in the future.)
1 parentda0b2cd commitf6e8730

File tree

124 files changed

+751
-750
lines changed

Some content is hidden

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

124 files changed

+751
-750
lines changed

‎contrib/dict_xsyn/dict_xsyn.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Copyright (c) 2007, PostgreSQL Global Development Group
77
*
88
* IDENTIFICATION
9-
* $PostgreSQL: pgsql/contrib/dict_xsyn/dict_xsyn.c,v 1.2 2007/11/1521:14:29 momjian Exp $
9+
* $PostgreSQL: pgsql/contrib/dict_xsyn/dict_xsyn.c,v 1.3 2007/11/1522:25:14 momjian Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -27,15 +27,15 @@ typedef struct
2727
char*key;/* Word */
2828
char*value;/* Unparsed list of synonyms, including the
2929
* word itself */
30-
}Syn;
30+
}Syn;
3131

3232
typedefstruct
3333
{
3434
intlen;
3535
Syn*syn;
3636

3737
boolkeeporig;
38-
}DictSyn;
38+
}DictSyn;
3939

4040

4141
PG_FUNCTION_INFO_V1(dxsyn_init);
@@ -72,7 +72,7 @@ compare_syn(const void *a, const void *b)
7272
}
7373

7474
staticvoid
75-
read_dictionary(DictSyn*d,char*filename)
75+
read_dictionary(DictSyn*d,char*filename)
7676
{
7777
char*real_filename=get_tsearch_config_filename(filename,"rules");
7878
FILE*fin;

‎contrib/intarray/_int_bool.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ typedef struct NODE
3636
int4type;
3737
int4val;
3838
structNODE*next;
39-
}NODE;
39+
}NODE;
4040

4141
typedefstruct
4242
{
@@ -226,7 +226,7 @@ typedef struct
226226
{
227227
int4*arrb;
228228
int4*arre;
229-
}CHKVAL;
229+
}CHKVAL;
230230

231231
/*
232232
* is there value 'val' in array or not ?
@@ -323,7 +323,7 @@ typedef struct
323323
{
324324
ITEM*first;
325325
bool*mapped_check;
326-
}GinChkVal;
326+
}GinChkVal;
327327

328328
staticbool
329329
checkcondition_gin(void*checkval,ITEM*item)
@@ -506,7 +506,7 @@ typedef struct
506506
char*buf;
507507
char*cur;
508508
int4buflen;
509-
}INFIX;
509+
}INFIX;
510510

511511
#defineRESIZEBUF(inf,addsize) while( ( (inf)->cur - (inf)->buf ) + (addsize) + 1 >= (inf)->buflen ) { \
512512
int4 len = inf->cur - inf->buf; \
@@ -516,7 +516,7 @@ typedef struct
516516
}
517517

518518
staticvoid
519-
infix(INFIX*in,boolfirst)
519+
infix(INFIX*in,boolfirst)
520520
{
521521
if (in->curpol->type==VAL)
522522
{

‎contrib/intarray/_int_gist.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@ typedef struct
343343
{
344344
OffsetNumberpos;
345345
floatcost;
346-
}SPLITCOST;
346+
}SPLITCOST;
347347

348348
staticint
349349
comparecost(constvoid*a,constvoid*b)

‎contrib/ltree/ltxtquery_io.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* txtquery io
33
* Teodor Sigaev <teodor@stack.net>
4-
* $PostgreSQL: pgsql/contrib/ltree/ltxtquery_io.c,v 1.13 2007/02/28 22:44:38 tgl Exp $
4+
* $PostgreSQL: pgsql/contrib/ltree/ltxtquery_io.c,v 1.14 2007/11/15 22:25:14 momjian Exp $
55
*/
66

77
#include"ltree.h"
@@ -32,7 +32,7 @@ typedef struct NODE
3232
int2length;
3333
uint16flag;
3434
structNODE*next;
35-
}NODE;
35+
}NODE;
3636

3737
typedefstruct
3838
{
@@ -384,7 +384,7 @@ typedef struct
384384
char*cur;
385385
char*op;
386386
int4buflen;
387-
}INFIX;
387+
}INFIX;
388388

389389
#defineRESIZEBUF(inf,addsize) \
390390
while( ( (inf)->cur - (inf)->buf ) + (addsize) + 1 >= (inf)->buflen ) \
@@ -400,7 +400,7 @@ while( ( (inf)->cur - (inf)->buf ) + (addsize) + 1 >= (inf)->buflen ) \
400400
* infix (human-readable) view
401401
*/
402402
staticvoid
403-
infix(INFIX*in,boolfirst)
403+
infix(INFIX*in,boolfirst)
404404
{
405405
if (in->curpol->type==VAL)
406406
{

‎contrib/ltree/ltxtquery_op.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* txtquery operations with ltree
33
* Teodor Sigaev <teodor@stack.net>
4-
* $PostgreSQL: pgsql/contrib/ltree/ltxtquery_op.c,v 1.6 2006/03/11 04:38:29 momjian Exp $
4+
* $PostgreSQL: pgsql/contrib/ltree/ltxtquery_op.c,v 1.7 2007/11/15 22:25:14 momjian Exp $
55
*/
66

77
#include"ltree.h"
@@ -45,7 +45,7 @@ typedef struct
4545
{
4646
ltree*node;
4747
char*operand;
48-
}CHKVAL;
48+
}CHKVAL;
4949

5050
staticbool
5151
checkcondition_str(void*checkval,ITEM*val)

‎contrib/test_parser/test_parser.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Copyright (c) 2007, PostgreSQL Global Development Group
77
*
88
* IDENTIFICATION
9-
* $PostgreSQL: pgsql/contrib/test_parser/test_parser.c,v 1.2 2007/11/1521:14:31 momjian Exp $
9+
* $PostgreSQL: pgsql/contrib/test_parser/test_parser.c,v 1.3 2007/11/1522:25:14 momjian Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -35,7 +35,7 @@ typedef struct
3535
intlexid;
3636
char*alias;
3737
char*descr;
38-
}LexDescr;
38+
}LexDescr;
3939

4040
/*
4141
* prototypes

‎contrib/uuid-ossp/uuid-ossp.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*
55
* Copyright (c) 2007 PostgreSQL Global Development Group
66
*
7-
* $PostgreSQL: pgsql/contrib/uuid-ossp/uuid-ossp.c,v 1.4 2007/11/1521:14:31 momjian Exp $
7+
* $PostgreSQL: pgsql/contrib/uuid-ossp/uuid-ossp.c,v 1.5 2007/11/1522:25:14 momjian Exp $
88
*
99
*-------------------------------------------------------------------------
1010
*/
@@ -165,7 +165,7 @@ uuid_generate_v1mc(PG_FUNCTION_ARGS)
165165

166166

167167
staticDatum
168-
uuid_generate_v35_internal(intmode,pg_uuid_t*ns,text*name)
168+
uuid_generate_v35_internal(intmode,pg_uuid_t*ns,text*name)
169169
{
170170
uuid_t*ns_uuid;
171171
Datumresult;

‎src/backend/access/gin/ginutil.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* Portions Copyright (c) 1994, Regents of the University of California
99
*
1010
* IDENTIFICATION
11-
*$PostgreSQL: pgsql/src/backend/access/gin/ginutil.c,v 1.11 2007/11/1521:14:31 momjian Exp $
11+
*$PostgreSQL: pgsql/src/backend/access/gin/ginutil.c,v 1.12 2007/11/1522:25:14 momjian Exp $
1212
*-------------------------------------------------------------------------
1313
*/
1414

@@ -133,10 +133,10 @@ typedef struct
133133
{
134134
FmgrInfo*cmpDatumFunc;
135135
bool*needUnique;
136-
}cmpEntriesData;
136+
}cmpEntriesData;
137137

138138
staticint
139-
cmpEntries(constDatum*a,constDatum*b,cmpEntriesData*arg)
139+
cmpEntries(constDatum*a,constDatum*b,cmpEntriesData*arg)
140140
{
141141
intres=DatumGetInt32(FunctionCall2(arg->cmpDatumFunc,
142142
*a,*b));

‎src/backend/access/heap/pruneheap.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/access/heap/pruneheap.c,v 1.4 2007/11/1521:14:32 momjian Exp $
11+
* $PostgreSQL: pgsql/src/backend/access/heap/pruneheap.c,v 1.5 2007/11/1522:25:15 momjian Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -75,11 +75,11 @@ heap_page_prune_opt(Relation relation, Buffer buffer, TransactionId OldestXmin)
7575
* fill-factor target (but not less than 10%).
7676
*
7777
* Checking free space here is questionable since we aren't holding any
78-
* lock on the buffer; in the worst case we could get a bogus answer.
79-
*It'sunlikely to be *seriously* wrong, though, since reading either
80-
*pd_loweror pd_upper is probably atomic.Avoiding taking a lock seems
81-
*betterthan sometimes getting a wrong answer in what is after all just
82-
*aheuristic estimate.
78+
* lock on the buffer; in the worst case we could get a bogus answer. It's
79+
* unlikely to be *seriously* wrong, though, since reading either pd_lower
80+
* or pd_upper is probably atomic.Avoiding taking a lock seems better
81+
* than sometimes getting a wrong answer in what is after all just a
82+
* heuristic estimate.
8383
*/
8484
minfree=RelationGetTargetPageFreeSpace(relation,
8585
HEAP_DEFAULT_FILLFACTOR);

‎src/backend/access/heap/rewriteheap.c‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696
* Portions Copyright (c) 1994-5, Regents of the University of California
9797
*
9898
* IDENTIFICATION
99-
* $PostgreSQL: pgsql/src/backend/access/heap/rewriteheap.c,v 1.8 2007/11/1521:14:32 momjian Exp $
99+
* $PostgreSQL: pgsql/src/backend/access/heap/rewriteheap.c,v 1.9 2007/11/1522:25:15 momjian Exp $
100100
*
101101
*-------------------------------------------------------------------------
102102
*/
@@ -129,7 +129,7 @@ typedef struct RewriteStateData
129129
* them */
130130
HTAB*rs_unresolved_tups;/* unmatched A tuples */
131131
HTAB*rs_old_new_tid_map;/* unmatched B tuples */
132-
}RewriteStateData;
132+
}RewriteStateData;
133133

134134
/*
135135
* The lookup keys for the hash tables are tuple TID and xmin (we must check
@@ -141,7 +141,7 @@ typedef struct
141141
{
142142
TransactionIdxmin;/* tuple xmin */
143143
ItemPointerDatatid;/* tuple location in old heap */
144-
}TidHashKey;
144+
}TidHashKey;
145145

146146
/*
147147
* Entry structures for the hash tables
@@ -151,15 +151,15 @@ typedef struct
151151
TidHashKeykey;/* expected xmin/old location of B tuple */
152152
ItemPointerDataold_tid;/* A's location in the old heap */
153153
HeapTupletuple;/* A's tuple contents */
154-
}UnresolvedTupData;
154+
}UnresolvedTupData;
155155

156156
typedefUnresolvedTupData*UnresolvedTup;
157157

158158
typedefstruct
159159
{
160160
TidHashKeykey;/* actual xmin/old location of B tuple */
161161
ItemPointerDatanew_tid;/* where we put it in the new heap */
162-
}OldToNewMappingData;
162+
}OldToNewMappingData;
163163

164164
typedefOldToNewMappingData*OldToNewMapping;
165165

@@ -425,8 +425,8 @@ rewrite_heap_tuple(RewriteState state,
425425
* If the tuple is the updated version of a row, and the prior version
426426
* wouldn't be DEAD yet, then we need to either resolve the prior
427427
* version (if it's waiting in rs_unresolved_tups), or make an entry
428-
* in rs_old_new_tid_map (so we can resolve it when we do see it).
429-
*Theprevious tuple's xmax would equal this one's xmin, so it's
428+
* in rs_old_new_tid_map (so we can resolve it when we do see it). The
429+
* previous tuple's xmax would equal this one's xmin, so it's
430430
* RECENTLY_DEAD if and only if the xmin is not before OldestXmin.
431431
*/
432432
if ((new_tuple->t_data->t_infomask&HEAP_UPDATED)&&

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp