Skip to content

Commit f6e8730

Browse files
bmomjianbmomjian
committed
Re-run pgindent with updated list of typedefs. (Updated README should
avoid this problem in the future.)
1 parent da0b2cd commit f6e8730

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/15 21:14:29 momjian Exp $
9+
* $PostgreSQL: pgsql/contrib/dict_xsyn/dict_xsyn.c,v 1.3 2007/11/15 22: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
typedef struct
3333
{
3434
int len;
3535
Syn *syn;
3636

3737
bool keeporig;
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
static void
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
int4 type;
3737
int4 val;
3838
struct NODE *next;
39-
} NODE;
39+
} NODE;
4040

4141
typedef struct
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
static bool
329329
checkcondition_gin(void *checkval, ITEM * item)
@@ -506,7 +506,7 @@ typedef struct
506506
char *buf;
507507
char *cur;
508508
int4 buflen;
509-
} INFIX;
509+
} INFIX;
510510

511511
#define RESIZEBUF(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
static void
519-
infix(INFIX * in, bool first)
519+
infix(INFIX *in, bool first)
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
OffsetNumber pos;
345345
float cost;
346-
} SPLITCOST;
346+
} SPLITCOST;
347347

348348
static int
349349
comparecost(const void *a, const void *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
int2 length;
3333
uint16 flag;
3434
struct NODE *next;
35-
} NODE;
35+
} NODE;
3636

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

389389
#define RESIZEBUF(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
static void
403-
infix(INFIX * in, bool first)
403+
infix(INFIX *in, bool first)
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
static bool
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/15 21:14:31 momjian Exp $
9+
* $PostgreSQL: pgsql/contrib/test_parser/test_parser.c,v 1.3 2007/11/15 22:25:14 momjian Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -35,7 +35,7 @@ typedef struct
3535
int lexid;
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/15 21:14:31 momjian Exp $
7+
* $PostgreSQL: pgsql/contrib/uuid-ossp/uuid-ossp.c,v 1.5 2007/11/15 22:25:14 momjian Exp $
88
*
99
*-------------------------------------------------------------------------
1010
*/
@@ -165,7 +165,7 @@ uuid_generate_v1mc(PG_FUNCTION_ARGS)
165165

166166

167167
static Datum
168-
uuid_generate_v35_internal(int mode, pg_uuid_t * ns, text *name)
168+
uuid_generate_v35_internal(int mode, pg_uuid_t *ns, text *name)
169169
{
170170
uuid_t *ns_uuid;
171171
Datum result;

‎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/15 21:14:31 momjian Exp $
11+
* $PostgreSQL: pgsql/src/backend/access/gin/ginutil.c,v 1.12 2007/11/15 22: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
static int
139-
cmpEntries(const Datum *a, const Datum *b, cmpEntriesData * arg)
139+
cmpEntries(const Datum *a, const Datum *b, cmpEntriesData *arg)
140140
{
141141
int res = 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/15 21:14:32 momjian Exp $
11+
* $PostgreSQL: pgsql/src/backend/access/heap/pruneheap.c,v 1.5 2007/11/15 22: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's unlikely to be *seriously* wrong, though, since reading either
80-
* pd_lower or pd_upper is probably atomic. Avoiding taking a lock seems
81-
* better than sometimes getting a wrong answer in what is after all just
82-
* a heuristic 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/15 21:14:32 momjian Exp $
99+
* $PostgreSQL: pgsql/src/backend/access/heap/rewriteheap.c,v 1.9 2007/11/15 22: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
TransactionId xmin; /* tuple xmin */
143143
ItemPointerData tid; /* 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
TidHashKey key; /* expected xmin/old location of B tuple */
152152
ItemPointerData old_tid; /* A's location in the old heap */
153153
HeapTuple tuple; /* A's tuple contents */
154-
} UnresolvedTupData;
154+
} UnresolvedTupData;
155155

156156
typedef UnresolvedTupData *UnresolvedTup;
157157

158158
typedef struct
159159
{
160160
TidHashKey key; /* actual xmin/old location of B tuple */
161161
ItemPointerData new_tid; /* where we put it in the new heap */
162-
} OldToNewMappingData;
162+
} OldToNewMappingData;
163163

164164
typedef OldToNewMappingData *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-
* The previous 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) &&

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
* Portions Copyright (c) 1994, Regents of the University of California
4141
*
4242
* IDENTIFICATION
43-
* $PostgreSQL: pgsql/src/backend/access/heap/syncscan.c,v 1.2 2007/11/15 21:14:32 momjian Exp $
43+
* $PostgreSQL: pgsql/src/backend/access/heap/syncscan.c,v 1.3 2007/11/15 22:25:15 momjian Exp $
4444
*
4545
*-------------------------------------------------------------------------
4646
*/
@@ -89,21 +89,21 @@ typedef struct ss_scan_location_t
8989
{
9090
RelFileNode relfilenode; /* identity of a relation */
9191
BlockNumber location; /* last-reported location in the relation */
92-
} ss_scan_location_t;
92+
} ss_scan_location_t;
9393

9494
typedef struct ss_lru_item_t
9595
{
9696
struct ss_lru_item_t *prev;
9797
struct ss_lru_item_t *next;
9898
ss_scan_location_t location;
99-
} ss_lru_item_t;
99+
} ss_lru_item_t;
100100

101101
typedef struct ss_scan_locations_t
102102
{
103103
ss_lru_item_t *head;
104104
ss_lru_item_t *tail;
105105
ss_lru_item_t items[1]; /* SYNC_SCAN_NELEM items */
106-
} ss_scan_locations_t;
106+
} ss_scan_locations_t;
107107

108108
#define SizeOfScanLocations(N) offsetof(ss_scan_locations_t, items[N])
109109

‎src/backend/access/nbtree/nbtxlog.c

Lines changed: 2 additions & 2 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/nbtree/nbtxlog.c,v 1.47 2007/11/15 21:14:32 momjian Exp $
11+
* $PostgreSQL: pgsql/src/backend/access/nbtree/nbtxlog.c,v 1.48 2007/11/15 22:25:15 momjian Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -40,7 +40,7 @@ typedef struct bt_incomplete_action
4040
BlockNumber rightblk; /* right half of split */
4141
/* these fields are for a delete: */
4242
BlockNumber delblk; /* parent block to be deleted */
43-
} bt_incomplete_action;
43+
} bt_incomplete_action;
4444

4545
static List *incomplete_actions;
4646

‎src/backend/access/transam/xlog.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
88
* Portions Copyright (c) 1994, Regents of the University of California
99
*
10-
* $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.289 2007/11/15 22:02:12 petere Exp $
10+
* $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.290 2007/11/15 22:25:15 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -1345,8 +1345,8 @@ static bool
13451345
XLogCheckpointNeeded(void)
13461346
{
13471347
/*
1348-
* A straight computation of segment number could overflow 32 bits.
1349-
* Rather than assuming we have working 64-bit arithmetic, we compare the
1348+
* A straight computation of segment number could overflow 32 bits. Rather
1349+
* than assuming we have working 64-bit arithmetic, we compare the
13501350
* highest-order bits separately, and force a checkpoint immediately when
13511351
* they change.
13521352
*/

‎src/backend/catalog/namespace.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* Portions Copyright (c) 1994, Regents of the University of California
1414
*
1515
* IDENTIFICATION
16-
* $PostgreSQL: pgsql/src/backend/catalog/namespace.c,v 1.100 2007/11/15 21:14:33 momjian Exp $
16+
* $PostgreSQL: pgsql/src/backend/catalog/namespace.c,v 1.101 2007/11/15 22:25:15 momjian Exp $
1717
*
1818
*-------------------------------------------------------------------------
1919
*/
@@ -147,7 +147,7 @@ typedef struct
147147
List *searchPath; /* the desired search path */
148148
Oid creationNamespace; /* the desired creation namespace */
149149
int nestLevel; /* subtransaction nesting level */
150-
} OverrideStackEntry;
150+
} OverrideStackEntry;
151151

152152
static List *overrideStack = NIL;
153153

@@ -2266,7 +2266,7 @@ GetOverrideSearchPath(MemoryContext context)
22662266
* search_path variable is ignored while an override is active.
22672267
*/
22682268
void
2269-
PushOverrideSearchPath(OverrideSearchPath * newpath)
2269+
PushOverrideSearchPath(OverrideSearchPath *newpath)
22702270
{
22712271
OverrideStackEntry *entry;
22722272
List *oidlist;

0 commit comments

Comments
 (0)