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

Commitd067f83

Browse files
committed
pgindent changes for Thomas proc/lock cleanup
1 parent19ba229 commitd067f83

File tree

2 files changed

+34
-31
lines changed

2 files changed

+34
-31
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.32 1998/02/24 19:58:26 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.33 1998/02/25 00:31:14 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -46,7 +46,7 @@
4646
*This is so that we can support more backends. (system-wide semaphore
4747
*sets run out pretty fast.) -ay 4/95
4848
*
49-
* $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.32 1998/02/24 19:58:26 momjian Exp $
49+
* $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.33 1998/02/25 00:31:14 momjian Exp $
5050
*/
5151
#include<sys/time.h>
5252
#include<unistd.h>
@@ -486,7 +486,7 @@ ProcSleep(PROC_QUEUE *waitQueue,
486486
proc= (PROC*)MAKE_PTR(proc->links.prev);
487487

488488
/* The rest of the queue is FIFO, with readers first, writers last */
489-
while (i++<waitQueue->size&&proc->prio <=prio)
489+
for ( ;i<waitQueue->size&&proc->prio <=prio;i++)
490490
proc= (PROC*)MAKE_PTR(proc->links.prev);
491491

492492
MyProc->prio=prio;

‎src/tools/pgindent/pgindent

Lines changed: 31 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ do
3434
# We get the list of typedef's from /src/tools/find_typedef
3535
indent -bad -bap -bc -bl -d0 -cdb -nce -nfc1 -di12 -i4 -l75 \
3636
-lp -nip -npro$EXTRA_OPTS \
37+
-TACL \
3738
-TA_Const \
3839
-TA_Expr \
3940
-TA_Indices \
@@ -44,7 +45,6 @@ do
4445
-TAclItem \
4546
-TAclMode \
4647
-TAddAttrStmt \
47-
-TAddr \
4848
-TAgg \
4949
-TAggFuncInfo \
5050
-TAggInfo \
@@ -56,12 +56,10 @@ do
5656
-TAllocPointer \
5757
-TAllocSet \
5858
-TAllocSetData \
59+
-TAlterUserStmt \
5960
-TAnyInvalidation \
6061
-TAppend \
6162
-TAppendState \
62-
-TAppendStmt \
63-
-TArchType \
64-
-TArchiveMode \
6563
-TArray \
6664
-TArrayRef \
6765
-TArrayType \
@@ -70,6 +68,8 @@ do
7068
-TAttrNumber \
7169
-TAttributeSize \
7270
-TAttributeTupleForm \
71+
-TAuthRequest \
72+
-TAuthRequestPacket \
7373
-TBOX \
7474
-TBTItem \
7575
-TBTItemData \
@@ -135,14 +135,15 @@ do
135135
-TConst \
136136
-TConstrCheck \
137137
-TConstrType \
138-
-TConstraintDef \
138+
-TConstraint \
139139
-TCopyStmt \
140140
-TCost \
141+
-TCreatePLangStmt \
141142
-TCreateSeqStmt \
142143
-TCreateStmt \
143144
-TCreateTrigStmt \
145+
-TCreateUserStmt \
144146
-TCreatedbStmt \
145-
-TCursorStmt \
146147
-TDateADT \
147148
-TDateTime \
148149
-TDatum \
@@ -154,11 +155,14 @@ do
154155
-TDestroydbStmt \
155156
-TDlelem \
156157
-TDllist \
158+
-TDropPLangStmt \
157159
-TDropTrigStmt \
160+
-TDropUserStmt \
158161
-TDynamicFileList \
159162
-TELEMENT \
160163
-TEState \
161164
-TEdge \
165+
-TErrorMessagePacket \
162166
-TExcContext \
163167
-TExcData \
164168
-TExcDetail \
@@ -169,7 +173,6 @@ do
169173
-TException \
170174
-TExecStatus \
171175
-TExecStatusType \
172-
-TExistential \
173176
-TExitStatus \
174177
-TExplainState \
175178
-TExplainStmt \
@@ -187,6 +190,7 @@ do
187190
-TFixedStackData \
188191
-TFjoin \
189192
-TFmgrCall \
193+
-TFmgrInfo \
190194
-TFmgrValues \
191195
-TFormData_pg_aggregate \
192196
-TFormData_pg_am \
@@ -210,7 +214,6 @@ do
210214
-TFormData_pg_rewrite \
211215
-TFormData_pg_sequence \
212216
-TFormData_pg_statistic \
213-
-TFormData_pg_time \
214217
-TFormData_pg_trigger \
215218
-TFormData_pg_user \
216219
-TFormData_pg_variable \
@@ -231,11 +234,9 @@ do
231234
-TForm_pg_relcheck \
232235
-TForm_pg_rewrite \
233236
-TForm_pg_statistic \
234-
-TForm_pg_time \
235237
-TForm_pg_trigger \
236238
-TForm_pg_user \
237239
-TForm_pg_variable \
238-
-TFrontEnd \
239240
-TFunc \
240241
-TFuncCall \
241242
-TFuncIndexInfo \
@@ -325,10 +326,10 @@ do
325326
-TInheritsTupleForm \
326327
-TInsertIndexResult \
327328
-TInsertIndexResultData \
329+
-TInsertStmt \
328330
-TIntArray \
329331
-TInt_yy_size_t \
330332
-TInt_yy_state_type \
331-
-TInternalTimeQual \
332333
-TInvalidationEntry \
333334
-TInvalidationEntryData \
334335
-TInvalidationMessage \
@@ -363,7 +364,6 @@ do
363364
-TLOCKT \
364365
-TLOCKTAB \
365366
-TLOCKTAG \
366-
-TLOCK_LEVEL \
367367
-TLOCK_TYPE \
368368
-TLRelId \
369369
-TLSEG \
@@ -394,7 +394,6 @@ do
394394
-TMergeJoinState \
395395
-TMergeOrder \
396396
-TMergePath \
397-
-TMoveStmt \
398397
-TMsgType \
399398
-TName \
400399
-TNameData \
@@ -429,6 +428,7 @@ do
429428
-TOverflowTuple \
430429
-TOverflowTupleData \
431430
-TPATH \
431+
-TPG_LOCK_LEVEL \
432432
-TPGconn \
433433
-TPGlobjfuncs \
434434
-TPGnotify \
@@ -443,19 +443,23 @@ do
443443
-TPROC \
444444
-TPROC_HDR \
445445
-TPROC_QUEUE \
446-
-TPacketBuf \
446+
-TPacket \
447447
-TPacketLen \
448+
-TPacketState \
448449
-TPage \
449450
-TPageHeader \
450451
-TPageHeaderData \
451452
-TPageManagerMode \
452453
-TPageOffset \
453454
-TParam \
455+
-TParamExecData \
454456
-TParamListInfo \
455457
-TParamListInfoData \
456458
-TParamNo \
457459
-TParamString \
458460
-TParseState \
461+
-TPasswordPacket \
462+
-TPasswordPacketV0 \
459463
-TPath \
460464
-TPathOrder \
461465
-TPlan \
@@ -479,9 +483,9 @@ do
479483
-TProcedureStmt \
480484
-TProcessingMode \
481485
-TProjectionInfo \
486+
-TProtocolVersion \
482487
-TPsortstate \
483488
-TPsqlSettings \
484-
-TPurgeStmt \
485489
-TQuery \
486490
-TQueryDesc \
487491
-TQueryTreeList \
@@ -517,14 +521,12 @@ do
517521
-TRemoveOperStmt \
518522
-TRemoveStmt \
519523
-TRenameStmt \
520-
-TReplaceStmt \
521524
-TResTarget \
522525
-TResdom \
523526
-TResult \
524527
-TResultState \
525528
-TRetrieveIndexResult \
526529
-TRetrieveIndexResultData \
527-
-TRetrieveStmt \
528530
-TRewriteInfo \
529531
-TRewriteRule \
530532
-TRuleLock \
@@ -547,19 +549,21 @@ do
547549
-TScanKey \
548550
-TScanKeyData \
549551
-TScanKeyword \
552+
-TSelectStmt \
550553
-TSeqScan \
551554
-TSeqTable \
552555
-TSeqTableData \
553556
-TSequenceTupleForm \
554557
-TSharedInvalid \
555558
-TSharedInvalidData \
556559
-TSize \
560+
-TSockAddr \
557561
-TSort \
558562
-TSortClause \
559563
-TSortGroupBy \
560564
-TSortState \
561565
-TSplitNumber \
562-
-TStartupInfo \
566+
-TStartupPacket \
563567
-TStrategyEvaluation \
564568
-TStrategyEvaluationData \
565569
-TStrategyExpression \
@@ -577,7 +581,9 @@ do
577581
-TStreamPtr \
578582
-TStringInfo \
579583
-TStringInfoData \
580-
-TSubSelect \
584+
-TSubLink \
585+
-TSubLinkType \
586+
-TSubPlan \
581587
-TSuperQE \
582588
-TSystemPortAddress \
583589
-TTUPLE \
@@ -592,13 +598,6 @@ do
592598
-TTimeADT \
593599
-TTimeInterval \
594600
-TTimeIntervalData \
595-
-TTimeQual \
596-
-TTimeQualData \
597-
-TTimeQualMode \
598-
-TTimeQualSpace \
599-
-TTimeRange \
600-
-TTimeRelationContents \
601-
-TTimeRelationContentsData \
602601
-TTimeSpan \
603602
-TTransactionId \
604603
-TTransactionState \
@@ -621,9 +620,10 @@ do
621620
-TTypeTupleForm \
622621
-TTypeTupleFormData \
623622
-TUNDO_LIST \
624-
-TUnionFlag \
625623
-TUnique \
626624
-TUniqueState \
625+
-TUpdateStmt \
626+
-TUserAuth \
627627
-TVAttList \
628628
-TVAttListData \
629629
-TVFunction \
@@ -795,8 +795,11 @@ do
795795
sed's;^/\*\(DATA(.*\)\*/$;\1;'|
796796
sed's;/\*---X_X;/* ---;g'|
797797
sed's;^static[ ][ ]*;static ;g'|# workaround indent bug
798+
sed's;^}[ ][ ]*/\*;} /*;'|
798799
detab -t8 -qc|
799-
entab -t4 -qc>/tmp/$$&& cat /tmp/$$>$FILE
800+
entab -t4 -qc|
801+
sed's;^\([A-Za-z_][^]*\)[ ][ ]*\*$;\1 *;'|# move trailing * in function return type
802+
cat>/tmp/$$&& cat /tmp/$$>$FILE
800803
done
801804

802805
# The 'for' loop makes these backup files useless

0 commit comments

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