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

Commit15d3f9f

Browse files
committed
Another pgindent run with lib typedefs added.
1 parent166300f commit15d3f9f

File tree

53 files changed

+1035
-988
lines changed

Some content is hidden

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

53 files changed

+1035
-988
lines changed

‎contrib/btree_gist/btree_utils_var.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
/* Returns a better readable representaion of variable key ( sets pointer ) */
66

7-
externGBT_VARKEY_R
7+
externGBT_VARKEY_R
88
gbt_var_key_readable(constGBT_VARKEY*k)
99
{
1010

‎contrib/tsearch2/tsvector.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1003,47 +1003,47 @@ Datum
10031003
tsvector_cmp(PG_FUNCTION_ARGS)
10041004
{
10051005
RUNCMP
1006-
PG_RETURN_INT32(res);
1006+
PG_RETURN_INT32(res);
10071007
}
10081008

10091009
Datum
10101010
tsvector_lt(PG_FUNCTION_ARGS)
10111011
{
10121012
RUNCMP
1013-
PG_RETURN_BOOL((res<0) ? true : false);
1013+
PG_RETURN_BOOL((res<0) ? true : false);
10141014
}
10151015

10161016
Datum
10171017
tsvector_le(PG_FUNCTION_ARGS)
10181018
{
10191019
RUNCMP
1020-
PG_RETURN_BOOL((res <=0) ? true : false);
1020+
PG_RETURN_BOOL((res <=0) ? true : false);
10211021
}
10221022

10231023
Datum
10241024
tsvector_eq(PG_FUNCTION_ARGS)
10251025
{
10261026
RUNCMP
1027-
PG_RETURN_BOOL((res==0) ? true : false);
1027+
PG_RETURN_BOOL((res==0) ? true : false);
10281028
}
10291029

10301030
Datum
10311031
tsvector_ge(PG_FUNCTION_ARGS)
10321032
{
10331033
RUNCMP
1034-
PG_RETURN_BOOL((res >=0) ? true : false);
1034+
PG_RETURN_BOOL((res >=0) ? true : false);
10351035
}
10361036

10371037
Datum
10381038
tsvector_gt(PG_FUNCTION_ARGS)
10391039
{
10401040
RUNCMP
1041-
PG_RETURN_BOOL((res>0) ? true : false);
1041+
PG_RETURN_BOOL((res>0) ? true : false);
10421042
}
10431043

10441044
Datum
10451045
tsvector_ne(PG_FUNCTION_ARGS)
10461046
{
10471047
RUNCMP
1048-
PG_RETURN_BOOL((res!=0) ? true : false);
1048+
PG_RETURN_BOOL((res!=0) ? true : false);
10491049
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
*
1111
*
1212
* IDENTIFICATION
13-
* $PostgreSQL: pgsql/src/backend/access/transam/xact.c,v 1.183 2004/08/29 05:06:40 momjian Exp $
13+
* $PostgreSQL: pgsql/src/backend/access/transam/xact.c,v 1.184 2004/08/30 02:54:38 momjian Exp $
1414
*
1515
*-------------------------------------------------------------------------
1616
*/
@@ -1704,7 +1704,7 @@ CommitTransactionCommand(void)
17041704
AbortOutOfAnyTransaction();
17051705
s=CurrentTransactionState;/* changed by
17061706
* AbortOutOfAnyTransaction
1707-
**/
1707+
**/
17081708
/* AbortOutOfAnyTransaction sets the blockState */
17091709
break;
17101710

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Portions Copyright (c) 1996-2004, 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.167 2004/08/29 16:34:47 tgl Exp $
10+
* $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.168 2004/08/30 02:54:38 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -2484,9 +2484,9 @@ got_record:;
24842484
/*
24852485
* Allocate or enlarge readRecordBuf as needed. To avoid useless
24862486
* small increases, round its size to a multiple of BLCKSZ, and make
2487-
* sure it's at least 4*BLCKSZ to start with. (That is enough for
2488-
*all"normal" records, but very large commit or abort records might
2489-
*needmore space.)
2487+
* sure it's at least 4*BLCKSZ to start with. (That is enough for all
2488+
* "normal" records, but very large commit or abort records might need
2489+
* more space.)
24902490
*/
24912491
if (total_len>readRecordBufSize)
24922492
{

‎src/backend/commands/dbcommands.c

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
*
1010
*
1111
* IDENTIFICATION
12-
* $PostgreSQL: pgsql/src/backend/commands/dbcommands.c,v 1.142 2004/08/29 21:08:47 tgl Exp $
12+
* $PostgreSQL: pgsql/src/backend/commands/dbcommands.c,v 1.143 2004/08/30 02:54:38 momjian Exp $
1313
*
1414
*-------------------------------------------------------------------------
1515
*/
@@ -1117,24 +1117,27 @@ dbase_redo(XLogRecPtr lsn, XLogRecord *record)
11171117
xl_dbase_create_rec*xlrec= (xl_dbase_create_rec*)XLogRecGetData(record);
11181118
char*dst_path=xlrec->src_path+strlen(xlrec->src_path)+1;
11191119
structstatst;
1120+
11201121
#ifndefWIN32
11211122
charbuf[2*MAXPGPATH+100];
11221123
#endif
11231124

11241125
/*
1125-
* Our theory for replaying a CREATE is to forcibly drop the target
1126-
* subdirectory if present, then re-copy the source data. This
1127-
* may be more work than needed, but it is simple to implement.
1126+
* Our theory for replaying a CREATE is to forcibly drop the
1127+
* target subdirectory if present, then re-copy the source data.
1128+
* This may be more work than needed, but it is simple to
1129+
* implement.
11281130
*/
11291131
if (stat(dst_path,&st)==0&&S_ISDIR(st.st_mode))
11301132
{
11311133
if (!rmtree(dst_path, true))
11321134
ereport(WARNING,
1133-
(errmsg("could not remove database directory \"%s\"",
1134-
dst_path)));
1135+
(errmsg("could not remove database directory \"%s\"",
1136+
dst_path)));
11351137
}
11361138

11371139
#ifndefWIN32
1140+
11381141
/*
11391142
* Copy this subdirectory to the new location
11401143
*
@@ -1164,7 +1167,10 @@ dbase_redo(XLogRecPtr lsn, XLogRecord *record)
11641167
{
11651168
xl_dbase_drop_rec*xlrec= (xl_dbase_drop_rec*)XLogRecGetData(record);
11661169

1167-
/* Drop pages for this database that are in the shared buffer cache */
1170+
/*
1171+
* Drop pages for this database that are in the shared buffer
1172+
* cache
1173+
*/
11681174
DropBuffers(xlrec->db_id);
11691175

11701176
if (!rmtree(xlrec->dir_path, true))

‎src/backend/commands/tablespace.c

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
*
4646
*
4747
* IDENTIFICATION
48-
* $PostgreSQL: pgsql/src/backend/commands/tablespace.c,v 1.10 2004/08/29 21:08:47 tgl Exp $
48+
* $PostgreSQL: pgsql/src/backend/commands/tablespace.c,v 1.11 2004/08/30 02:54:38 momjian Exp $
4949
*
5050
*-------------------------------------------------------------------------
5151
*/
@@ -146,27 +146,27 @@ TablespaceCreateDbspace(Oid spcNode, Oid dbNode, bool isRedo)
146146
/* OK, go for it */
147147
if (mkdir(dir,S_IRWXU)<0)
148148
{
149-
char*parentdir;
149+
char*parentdir;
150150

151151
if (errno!=ENOENT|| !isRedo)
152152
ereport(ERROR,
153153
(errcode_for_file_access(),
154-
errmsg("could not create directory \"%s\": %m",
155-
dir)));
154+
errmsg("could not create directory \"%s\": %m",
155+
dir)));
156156
/* Try to make parent directory too */
157157
parentdir=pstrdup(dir);
158158
get_parent_directory(parentdir);
159159
if (mkdir(parentdir,S_IRWXU)<0)
160160
ereport(ERROR,
161161
(errcode_for_file_access(),
162-
errmsg("could not create directory \"%s\": %m",
163-
parentdir)));
162+
errmsg("could not create directory \"%s\": %m",
163+
parentdir)));
164164
pfree(parentdir);
165165
if (mkdir(dir,S_IRWXU)<0)
166166
ereport(ERROR,
167167
(errcode_for_file_access(),
168-
errmsg("could not create directory \"%s\": %m",
169-
dir)));
168+
errmsg("could not create directory \"%s\": %m",
169+
dir)));
170170
}
171171
}
172172

@@ -444,7 +444,8 @@ DropTableSpace(DropTableSpaceStmt *stmt)
444444
tablespacename);
445445

446446
/*
447-
* Remove the pg_tablespace tuple (this will roll back if we fail below)
447+
* Remove the pg_tablespace tuple (this will roll back if we fail
448+
* below)
448449
*/
449450
simple_heap_delete(rel,&tuple->t_self);
450451

@@ -598,8 +599,8 @@ remove_tablespace_directories(Oid tablespaceoid, bool redo)
598599
/*
599600
* Okay, try to remove the symlink. We must however deal with the
600601
* possibility that it's a directory instead of a symlink --- this
601-
* could happen during WAL replay (see TablespaceCreateDbspace),
602-
*andit is also the normal case on Windows.
602+
* could happen during WAL replay (see TablespaceCreateDbspace), and
603+
* it is also the normal case on Windows.
603604
*/
604605
if (lstat(location,&st)==0&&S_ISDIR(st.st_mode))
605606
{
@@ -959,14 +960,14 @@ tblspc_redo(XLogRecPtr lsn, XLogRecord *record)
959960
char*linkloc;
960961

961962
/*
962-
* Attempt to coerce target directory to safe permissions.If this
963-
* fails, it doesn't exist or has the wrong owner.
963+
* Attempt to coerce target directory to safe permissions.If
964+
*thisfails, it doesn't exist or has the wrong owner.
964965
*/
965966
if (chmod(location,0700)!=0)
966967
ereport(ERROR,
967968
(errcode_for_file_access(),
968-
errmsg("could not set permissions on directory \"%s\": %m",
969-
location)));
969+
errmsg("could not set permissions on directory \"%s\": %m",
970+
location)));
970971

971972
/* Create or re-create the PG_VERSION file in the target directory */
972973
set_short_version(location);
@@ -980,8 +981,8 @@ tblspc_redo(XLogRecPtr lsn, XLogRecord *record)
980981
if (errno!=EEXIST)
981982
ereport(ERROR,
982983
(errcode_for_file_access(),
983-
errmsg("could not create symbolic link \"%s\": %m",
984-
linkloc)));
984+
errmsg("could not create symbolic link \"%s\": %m",
985+
linkloc)));
985986
}
986987

987988
pfree(linkloc);

‎src/backend/commands/vacuum.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
*
1414
*
1515
* IDENTIFICATION
16-
* $PostgreSQL: pgsql/src/backend/commands/vacuum.c,v 1.289 2004/08/29 05:06:41 momjian Exp $
16+
* $PostgreSQL: pgsql/src/backend/commands/vacuum.c,v 1.290 2004/08/30 02:54:38 momjian Exp $
1717
*
1818
*-------------------------------------------------------------------------
1919
*/
@@ -1704,10 +1704,10 @@ repair_frag(VRelStats *vacrelstats, Relation onerel,
17041704
if (!(tuple.t_data->t_infomask&HEAP_XMIN_COMMITTED))
17051705
{
17061706
/*
1707-
* There cannot be another concurrently running VACUUM.
1708-
*Ifthe tuple had been moved in by a previous VACUUM,
1709-
*thevisibility check would have set XMIN_COMMITTED.If
1710-
*thetuple had been moved in by the currently running
1707+
* There cannot be another concurrently running VACUUM. If
1708+
* the tuple had been moved in by a previous VACUUM, the
1709+
* visibility check would have set XMIN_COMMITTED.If the
1710+
* tuple had been moved in by the currently running
17111711
* VACUUM, the loop would have been terminated. We had
17121712
* elog(ERROR, ...) here, but as we are testing for a
17131713
* can't-happen condition, Assert() seems more

‎src/backend/commands/variable.c

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
*
1010
*
1111
* IDENTIFICATION
12-
* $PostgreSQL: pgsql/src/backend/commands/variable.c,v 1.101 2004/08/29 05:06:41 momjian Exp $
12+
* $PostgreSQL: pgsql/src/backend/commands/variable.c,v 1.102 2004/08/30 02:54:38 momjian Exp $
1313
*
1414
*-------------------------------------------------------------------------
1515
*/
@@ -270,6 +270,7 @@ assign_timezone(const char *value, bool doit, GucSource source)
270270
CStringGetDatum(val),
271271
ObjectIdGetDatum(InvalidOid),
272272
Int32GetDatum(-1)));
273+
273274
pfree(val);
274275
if (interval->month!=0)
275276
{
@@ -284,6 +285,7 @@ assign_timezone(const char *value, bool doit, GucSource source)
284285
{
285286
/* Here we change from SQL to Unix sign convention */
286287
CTimeZone=-interval->time;
288+
287289
HasCTZSet= true;
288290
}
289291
pfree(interval);
@@ -448,10 +450,10 @@ show_timezone(void)
448450

449451
if (HasCTZSet)
450452
{
451-
Intervalinterval;
453+
Intervalinterval;
452454

453-
interval.month=0;
454-
interval.time=-CTimeZone;
455+
interval.month=0;
456+
interval.time=-CTimeZone;
455457

456458
tzn=DatumGetCString(DirectFunctionCall1(interval_out,
457459
IntervalPGetDatum(&interval)));

‎src/backend/optimizer/plan/planner.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/optimizer/plan/planner.c,v 1.174 2004/08/29 05:06:44 momjian Exp $
11+
* $PostgreSQL: pgsql/src/backend/optimizer/plan/planner.c,v 1.175 2004/08/30 02:54:38 momjian Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -431,8 +431,8 @@ preprocess_expression(Query *parse, Node *expr, int kind)
431431
/*
432432
* If it's a qual or havingQual, convert it to implicit-AND format.
433433
* (We don't want to do this before eval_const_expressions, since the
434-
* latter would be unable to simplify a top-level AND correctly.
435-
*Also,SS_process_sublinks expects explicit-AND format.)
434+
* latter would be unable to simplify a top-level AND correctly. Also,
435+
* SS_process_sublinks expects explicit-AND format.)
436436
*/
437437
if (kind==EXPRKIND_QUAL)
438438
expr= (Node*)make_ands_implicit((Expr*)expr);

‎src/backend/port/beos/support.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ beos_startup(int argc, char **argv)
168168
/* Main server loop */
169169
for (;;)
170170
{
171-
int32opcode=0;
171+
int32opcode=0;
172172
chardatas[4000];
173173

174174
/*

‎src/backend/port/win32/socket.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group
77
*
88
* IDENTIFICATION
9-
* $PostgreSQL: pgsql/src/backend/port/win32/socket.c,v 1.4 2004/08/29 05:06:46 momjian Exp $
9+
* $PostgreSQL: pgsql/src/backend/port/win32/socket.c,v 1.5 2004/08/30 02:54:38 momjian Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -33,15 +33,15 @@ TranslateSocketError(void)
3333
{
3434
switch (WSAGetLastError())
3535
{
36-
caseWSANOTINITIALISED:
37-
caseWSAENETDOWN:
38-
caseWSAEINPROGRESS:
39-
caseWSAEINVAL:
40-
caseWSAESOCKTNOSUPPORT:
41-
caseWSAEFAULT:
42-
caseWSAEINVALIDPROVIDER:
43-
caseWSAEINVALIDPROCTABLE:
44-
caseWSAEMSGSIZE:
36+
caseWSANOTINITIALISED:
37+
caseWSAENETDOWN:
38+
caseWSAEINPROGRESS:
39+
caseWSAEINVAL:
40+
caseWSAESOCKTNOSUPPORT:
41+
caseWSAEFAULT:
42+
caseWSAEINVALIDPROVIDER:
43+
caseWSAEINVALIDPROCTABLE:
44+
caseWSAEMSGSIZE:
4545
errno=EINVAL;
4646
break;
4747
caseWSAEAFNOSUPPORT:

‎src/backend/storage/lmgr/s_lock.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
*
1010
*
1111
* IDENTIFICATION
12-
* $PostgreSQL: pgsql/src/backend/storage/lmgr/s_lock.c,v 1.30 2004/08/29 05:06:48 momjian Exp $
12+
* $PostgreSQL: pgsql/src/backend/storage/lmgr/s_lock.c,v 1.31 2004/08/30 02:54:38 momjian Exp $
1313
*
1414
*-------------------------------------------------------------------------
1515
*/
@@ -237,7 +237,6 @@ tas_dummy()/* really means: extern int tas(slock_t
237237
asm("nop");
238238
}
239239
#endif/* __sparc || __sparc__ */
240-
241240
#endif/* not __GNUC__ */
242241
#endif/* HAVE_SPINLOCKS */
243242

0 commit comments

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