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

Commit76ece16

Browse files
committed
perltidy: Add option --nooutdent-long-comments
1 parentd4f16d5 commit76ece16

File tree

18 files changed

+103
-102
lines changed

18 files changed

+103
-102
lines changed

‎src/backend/utils/Gen_dummy_probes.pl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -97,35 +97,35 @@ ()
9797
$CondReg ||=$s;
9898
}
9999

100-
# s/([^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\})/(INT1, INT2, INT3, INT4)/
100+
# s/([^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\})/(INT1, INT2, INT3, INT4)/
101101
{
102102
$s =
103103
s /\([^,)]+, [^,)]+, [^,)]+, [^,)]+\)/(INT1, INT2, INT3, INT4)/s;
104104
$CondReg ||=$s;
105105
}
106106

107-
# s/([^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\})/(INT1, INT2, INT3, INT4, INT5)/
107+
# s/([^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\})/(INT1, INT2, INT3, INT4, INT5)/
108108
{
109109
$s =
110110
s /\([^,)]+, [^,)]+, [^,)]+, [^,)]+, [^,)]+\)/(INT1, INT2, INT3, INT4, INT5)/s;
111111
$CondReg ||=$s;
112112
}
113113

114-
# s/([^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\})/(INT1, INT2, INT3, INT4, INT5, INT6)/
114+
# s/([^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\})/(INT1, INT2, INT3, INT4, INT5, INT6)/
115115
{
116116
$s =
117117
s /\([^,)]+, [^,)]+, [^,)]+, [^,)]+, [^,)]+, [^,)]+\)/(INT1, INT2, INT3, INT4, INT5, INT6)/s;
118118
$CondReg ||=$s;
119119
}
120120

121-
# s/([^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\})/(INT1, INT2, INT3, INT4, INT5, INT6, INT7)/
121+
# s/([^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\})/(INT1, INT2, INT3, INT4, INT5, INT6, INT7)/
122122
{
123123
$s =
124124
s /\([^,)]+, [^,)]+, [^,)]+, [^,)]+, [^,)]+, [^,)]+, [^,)]+\)/(INT1, INT2, INT3, INT4, INT5, INT6, INT7)/s;
125125
$CondReg ||=$s;
126126
}
127127

128-
# s/([^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\})/(INT1, INT2, INT3, INT4, INT5, INT6, INT7, INT8)/
128+
# s/([^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\})/(INT1, INT2, INT3, INT4, INT5, INT6, INT7, INT8)/
129129
{
130130
$s =
131131
s /\([^,)]+, [^,)]+, [^,)]+, [^,)]+, [^,)]+, [^,)]+, [^,)]+, [^,)]+\)/(INT1, INT2, INT3, INT4, INT5, INT6, INT7, INT8)/s;

‎src/backend/utils/mb/Unicode/UCS_to_BIG5.pl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,9 @@
6262
my$code =$i->{code};
6363
my$ucs =$i->{ucs};
6464

65-
# BIG5.TXT maps several BIG5 characters to U+FFFD. The UTF-8 to BIG5 mapping can
66-
# contain only one of them. XXX: Doesn't really make sense to include any of them,
67-
# but for historical reasons, we map the first one of them.
65+
# BIG5.TXT maps several BIG5 characters to U+FFFD. The UTF-8 to BIG5 mapping can
66+
# contain only one of them. XXX: Doesn't really make sense to include any of them,
67+
# but for historical reasons, we map the first one of them.
6868
if ($i->{ucs} == 0xFFFD &&$i->{code} != 0xA15A)
6969
{
7070
$i->{direction} = TO_UNICODE;

‎src/backend/utils/mb/Unicode/convutils.pm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,11 +138,11 @@ sub print_conversion_tables_direction
138138
print$out"/* src/backend/utils/mb/Unicode/$fname */\n";
139139
print$out"/* This file is generated by$this_script */\n\n";
140140

141-
# Collect regular, non-combined, mappings, and create the radix tree from them.
141+
# Collect regular, non-combined, mappings, and create the radix tree from them.
142142
my$charmap = &make_charmap($out,$charset,$direction, 0);
143143
print_radix_table($out,$tblname,$charmap);
144144

145-
# Collect combined characters, and create combined character table (if any)
145+
# Collect combined characters, and create combined character table (if any)
146146
my$charmap_combined = &make_charmap_combined($charset,$direction);
147147

148148
if (scalar @{$charmap_combined} > 0)

‎src/bin/pg_basebackup/t/010_pg_basebackup.pl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@
213213
# Move pg_replslot out of $pgdata and create a symlink to it.
214214
$node->stop;
215215

216-
# Set umask so test directories and files are created with group permissions
216+
# Set umask so test directories and files are created with group permissions
217217
umask(0027);
218218

219219
# Enable group permissions on PGDATA
@@ -245,7 +245,7 @@
245245
is(scalar(@tblspc_tars), 1,'one tablespace tar was created');
246246
rmtree("$tempdir/tarbackup2");
247247

248-
# Create an unlogged table to test that forks other than init are not copied.
248+
# Create an unlogged table to test that forks other than init are not copied.
249249
$node->safe_psql('postgres',
250250
'CREATE UNLOGGED TABLE tblspc1_unlogged (id int) TABLESPACE tblspc1;'
251251
);
@@ -258,8 +258,8 @@
258258
'unlogged init fork in tablespace');
259259
ok(-f"$pgdata/$tblspc1UnloggedPath",'unlogged main fork in tablespace');
260260

261-
# Create files that look like temporary relations to ensure they are ignored
262-
# in a tablespace.
261+
# Create files that look like temporary relations to ensure they are ignored
262+
# in a tablespace.
263263
my@tempRelationFiles =qw(t888_888 t888888_888888_vm.1);
264264
my$tblSpc1Id = basename(
265265
dirname(

‎src/bin/pg_dump/t/002_pg_dump.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2864,7 +2864,7 @@
28642864
next;
28652865
}
28662866
2867-
# If there is a like entry, but no unlike entry, then we will test the like case
2867+
# If there is a like entry, but no unlike entry, then we will test the like case
28682868
if ($tests{$test}->{like}->{$test_key}
28692869
&& !defined($tests{$test}->{unlike}->{$test_key}))
28702870
{

‎src/bin/pgbench/t/001_pgbench_with_server.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -670,7 +670,7 @@ sub pgbench
670670

671671
pgbench(
672672

673-
# given the expected rate and the 2 ms tx duration, at most one is executed
673+
# given the expected rate and the 2 ms tx duration, at most one is executed
674674
'-t 10 --rate=100000 --latency-limit=1 -n -r',
675675
0,
676676
[qr{processed: [01]/10},

‎src/interfaces/ecpg/preproc/parse.pl

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -134,20 +134,20 @@ sub main
134134

135135
chomp;
136136

137-
# comment out the line below to make the result file match (blank line wise)
138-
# the prior version.
139-
#next if ($_ eq '');
140-
141-
# Dump the action for a rule -
142-
# stmt_mode indicates if we are processing the 'stmt:'
143-
# rule (mode==0 means normal, mode==1 means stmt:)
144-
# flds are the fields to use. These may start with a '$' - in
145-
# which case they are the result of a previous non-terminal
146-
#
147-
# if they dont start with a '$' then they are token name
148-
#
149-
# len is the number of fields in flds...
150-
# leadin is the padding to apply at the beginning (just use for formatting)
137+
# comment out the line below to make the result file match (blank line wise)
138+
# the prior version.
139+
#next if ($_ eq '');
140+
141+
# Dump the action for a rule -
142+
# stmt_mode indicates if we are processing the 'stmt:'
143+
# rule (mode==0 means normal, mode==1 means stmt:)
144+
# flds are the fields to use. These may start with a '$' - in
145+
# which case they are the result of a previous non-terminal
146+
#
147+
# if they dont start with a '$' then they are token name
148+
#
149+
# len is the number of fields in flds...
150+
# leadin is the padding to apply at the beginning (just use for formatting)
151151

152152
if (/^%%/)
153153
{
@@ -223,7 +223,7 @@ sub main
223223
next line;
224224
}
225225

226-
# Dont worry about anything if we're not in the right section of gram.y
226+
# Dont worry about anything if we're not in the right section of gram.y
227227
if ($yaccmode != 1)
228228
{
229229
next line;
@@ -632,8 +632,8 @@ sub preload_addons
632632
my$filename =$path ."/ecpg.addons";
633633
open(my$fh,'<',$filename)ordie;
634634

635-
# there may be multiple lines starting ECPG: and then multiple lines of code.
636-
# the code need to be add to all prior ECPG records.
635+
# there may be multiple lines starting ECPG: and then multiple lines of code.
636+
# the code need to be add to all prior ECPG records.
637637
my (@needsRules,@code,$record);
638638

639639
# there may be comments before the first ECPG line, skip them

‎src/pl/plperl/plperl_opmask.pl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@
3838
# (included in :default) but aren't considered sufficiently safe
3939
qw[!dbmopen !setpgrp !setpriority],
4040

41-
# custom is not deemed a likely security risk as it can't be generated from
42-
# perl so would only be seen if the DBA had chosen to load a module that
43-
# used it. Even then it's unlikely to be seen because it's typically
44-
# generated by compiler plugins that operate after PL_op_mask checks.
45-
# But we err on the side of caution and disable it
41+
# custom is not deemed a likely security risk as it can't be generated from
42+
# perl so would only be seen if the DBA had chosen to load a module that
43+
# used it. Even then it's unlikely to be seen because it's typically
44+
# generated by compiler plugins that operate after PL_op_mask checks.
45+
# But we err on the side of caution and disable it
4646
qw[!custom],);
4747

4848
printf$fh" /* ALLOWED:@allowed_ops */\\\n";

‎src/test/modules/test_pg_dump/t/001_base.pl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,7 @@
370370
section_pre_data => 1, },
371371
unlike => { no_privs => 1, }, },
372372
373-
# Objects included in extension part of a schema created by this extension */
373+
# Objects included in extension part of a schema created by this extension */
374374
'CREATE TABLE regress_pg_dump_schema.test_table' => {
375375
regexp => qr/^
376376
\QCREATE TABLE regress_pg_dump_schema.test_table (\E
@@ -498,7 +498,7 @@
498498
# Then count all the tests run against each run
499499
foreach my$test (sort keys%tests)
500500
{
501-
# If there is a like entry, but no unlike entry, then we will test the like case
501+
# If there is a like entry, but no unlike entry, then we will test the like case
502502
if ($tests{$test}->{like}->{$test_key}
503503
&& !defined($tests{$test}->{unlike}->{$test_key}))
504504
{

‎src/test/perl/PostgresNode.pm

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1197,12 +1197,12 @@ sub psql
11971197

11981198
my$ret;
11991199

1200-
# Run psql and capture any possible exceptions. If the exception is
1201-
# because of a timeout and the caller requested to handle that, just return
1202-
# and set the flag. Otherwise, and for any other exception, rethrow.
1203-
#
1204-
# For background, see
1205-
# http://search.cpan.org/~ether/Try-Tiny-0.24/lib/Try/Tiny.pm
1200+
# Run psql and capture any possible exceptions. If the exception is
1201+
# because of a timeout and the caller requested to handle that, just return
1202+
# and set the flag. Otherwise, and for any other exception, rethrow.
1203+
#
1204+
# For background, see
1205+
# http://search.cpan.org/~ether/Try-Tiny-0.24/lib/Try/Tiny.pm
12061206
do
12071207
{
12081208
local$@;

‎src/test/recovery/t/006_logical_decoding.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@
108108
SKIP:
109109
{
110110

111-
# some Windows Perls at least don't like IPC::Run's start/kill_kill regime.
111+
# some Windows Perls at least don't like IPC::Run's start/kill_kill regime.
112112
skip"Test fails on Windows perl", 2if$Config{osname}eq'MSWin32';
113113

114114
my$pg_recvlogical = IPC::Run::start(

‎src/test/recovery/t/011_crash_recovery.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
if ($Config{osname}eq'MSWin32')
1111
{
1212

13-
# some Windows Perls at least don't like IPC::Run's start/kill_kill regime.
13+
# some Windows Perls at least don't like IPC::Run's start/kill_kill regime.
1414
planskip_all=>"Test fails on Windows perl";
1515
}
1616
else

‎src/test/ssl/ServerSetup.pm

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ sub configure_test_server_for_ssl
115115
openmy$sslconf,'>',"$pgdata/sslconfig.conf";
116116
close$sslconf;
117117

118-
# Copy all server certificates and keys, and client root cert, to the data dir
118+
# Copy all server certificates and keys, and client root cert, to the data dir
119119
copy_files("ssl/server-*.crt",$pgdata);
120120
copy_files("ssl/server-*.key",$pgdata);
121121
chmod(0600,glob"$pgdata/server-*.key")ordie$!;
@@ -155,10 +155,10 @@ sub configure_hba_for_ssl
155155
my ($node,$serverhost,$authmethod) =@_;
156156
my$pgdata =$node->data_dir;
157157

158-
# Only accept SSL connections from localhost. Our tests don't depend on this
159-
# but seems best to keep it as narrow as possible for security reasons.
160-
#
161-
# When connecting to certdb, also check the client certificate.
158+
# Only accept SSL connections from localhost. Our tests don't depend on this
159+
# but seems best to keep it as narrow as possible for security reasons.
160+
#
161+
# When connecting to certdb, also check the client certificate.
162162
openmy$hba,'>',"$pgdata/pg_hba.conf";
163163
print$hba
164164
"# TYPE DATABASE USER ADDRESS METHOD\n";

‎src/tools/msvc/Mkvcbuild.pm

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -179,8 +179,8 @@ sub mkvcbuild
179179
$postgres->AddLibrary('wldap32.lib')if ($solution->{options}->{ldap});
180180
$postgres->FullExportDLL('postgres.lib');
181181

182-
# The OBJS scraper doesn't know about ifdefs, so remove be-secure-openssl.c
183-
# if building without OpenSSL
182+
# The OBJS scraper doesn't know about ifdefs, so remove be-secure-openssl.c
183+
# if building without OpenSSL
184184
if (!$solution->{options}->{openssl})
185185
{
186186
$postgres->RemoveFile('src/backend/libpq/be-secure-common.c');
@@ -239,9 +239,9 @@ sub mkvcbuild
239239
'src/interfaces/libpq/libpq.rc');
240240
$libpq->AddReference($libpgport);
241241

242-
# The OBJS scraper doesn't know about ifdefs, so remove fe-secure-openssl.c
243-
# and sha2_openssl.c if building without OpenSSL, and remove sha2.c if
244-
# building with OpenSSL.
242+
# The OBJS scraper doesn't know about ifdefs, so remove fe-secure-openssl.c
243+
# and sha2_openssl.c if building without OpenSSL, and remove sha2.c if
244+
# building with OpenSSL.
245245
if (!$solution->{options}->{openssl})
246246
{
247247
$libpq->RemoveFile('src/interfaces/libpq/fe-secure-common.c');
@@ -530,9 +530,9 @@ sub mkvcbuild
530530

531531
my$perl_path =$solution->{options}->{perl} .'\lib\CORE\*perl*';
532532

533-
# ActivePerl 5.16 provided perl516.lib; 5.18 provided libperl518.a
534-
# Starting with ActivePerl 5.24, both perlnn.lib and libperlnn.a are provided.
535-
# In this case, prefer .lib.
533+
# ActivePerl 5.16 provided perl516.lib; 5.18 provided libperl518.a
534+
# Starting with ActivePerl 5.24, both perlnn.lib and libperlnn.a are provided.
535+
# In this case, prefer .lib.
536536
my@perl_libs =
537537
reversesortgrep {/perl\d+\.lib$|libperl\d+\.a$/ }
538538
glob($perl_path);

‎src/tools/msvc/Project.pm

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -345,15 +345,15 @@ sub Save
345345
{
346346
my ($self) =@_;
347347

348-
# If doing DLL and haven't specified a DEF file, do a full export of all symbols
349-
# in the project.
348+
# If doing DLL and haven't specified a DEF file, do a full export of all symbols
349+
# in the project.
350350
if ($self->{type}eq"dll" && !$self->{def})
351351
{
352352
$self->FullExportDLL($self->{name} .".lib");
353353
}
354354

355-
# Warning 4197 is about double exporting, disable this per
356-
# http://connect.microsoft.com/VisualStudio/feedback/ViewFeedback.aspx?FeedbackID=99193
355+
# Warning 4197 is about double exporting, disable this per
356+
# http://connect.microsoft.com/VisualStudio/feedback/ViewFeedback.aspx?FeedbackID=99193
357357
$self->DisableLinkerWarnings('4197')if ($self->{platform}eq'x64');
358358

359359
# Dump the project

‎src/tools/msvc/VSObjectFactory.pm

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ sub CreateSolution
5454
return new VS2015Solution(@_);
5555
}
5656

57-
# visual 2017 hasn't changed the nmake version to 15, so adjust the check to support it.
57+
# visual 2017 hasn't changed the nmake version to 15, so adjust the check to support it.
5858
elsif (($visualStudioVersionge'14.10')
5959
or ($visualStudioVersioneq'15.00'))
6060
{
@@ -101,7 +101,7 @@ sub CreateProject
101101
return new VC2015Project(@_);
102102
}
103103

104-
# visual 2017 hasn't changed the nmake version to 15, so adjust the check to support it.
104+
# visual 2017 hasn't changed the nmake version to 15, so adjust the check to support it.
105105
elsif (($visualStudioVersionge'14.10')
106106
or ($visualStudioVersioneq'15.00'))
107107
{
@@ -137,7 +137,7 @@ sub _GetVisualStudioVersion
137137
{
138138
my ($major,$minor) =@_;
139139

140-
# visual 2017 hasn't changed the nmake version to 15, so still using the older version for comparison.
140+
# visual 2017 hasn't changed the nmake version to 15, so still using the older version for comparison.
141141
if ($major > 14)
142142
{
143143
carp

0 commit comments

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