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

Commitdd56921

Browse files
committed
Clean up more unused variables in perl code
This is a continuation of0c1aca4, with some cleanup in:- msvc_gendef.pl- pgindent- 005_negotiate_encryption.pl, as of an oversight ofd39a49c thathas removed %params in test_matrix(), making also $server_configuseless.Author: Dagfinn Ilmari MannsåkerDiscussion:https://postgr.es/m/87wmm4dkci.fsf@wibble.ilmari.org
1 parentdec9d4a commitdd56921

File tree

3 files changed

+7
-22
lines changed

3 files changed

+7
-22
lines changed

‎src/interfaces/libpq/t/005_negotiate_encryption.pl

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -215,11 +215,6 @@ BEGIN
215215
my@all_sslmodes = ('disable','allow','prefer','require');
216216
my@all_sslnegotiations = ('postgres','direct');
217217

218-
my$server_config = {
219-
server_ssl=> 0,
220-
server_gss=> 0,
221-
};
222-
223218
###
224219
### Run tests with GSS and SSL disabled in the server
225220
###
@@ -272,7 +267,7 @@ BEGIN
272267
};
273268

274269
note("Running tests with SSL and GSS disabled in the server");
275-
test_matrix($node,$server_config,
270+
test_matrix($node,
276271
['testuser'], \@all_gssencmodes, \@all_sslmodes, \@all_sslnegotiations,
277272
parse_table($test_table));
278273

@@ -311,19 +306,15 @@ BEGIN
311306
# Enable SSL in the server
312307
$node->adjust_conf('postgresql.conf','ssl','on');
313308
$node->reload;
314-
$server_config->{server_ssl} = 1;
315309

316310
note("Running tests with SSL enabled in server");
317-
test_matrix(
318-
$node,$server_config,
319-
['testuser','ssluser','nossluser' ], ['disable'],
320-
\@all_sslmodes, \@all_sslnegotiations,
311+
test_matrix($node, ['testuser','ssluser','nossluser' ],
312+
['disable'], \@all_sslmodes, \@all_sslnegotiations,
321313
parse_table($test_table));
322314

323315
# Disable SSL again
324316
$node->adjust_conf('postgresql.conf','ssl','off');
325317
$node->reload;
326-
$server_config->{server_ssl} = 0;
327318
}
328319

329320
###
@@ -336,7 +327,6 @@ BEGIN
336327

337328
$krb->create_principal('gssuser',$gssuser_password);
338329
$krb->create_ticket('gssuser',$gssuser_password);
339-
$server_config->{server_gss} = 1;
340330

341331
$test_table =q{
342332
# USER GSSENCMODE SSLMODE SSLNEGOTIATION EVENTS -> OUTCOME
@@ -400,7 +390,7 @@ BEGIN
400390
}
401391

402392
note("Running tests with GSS enabled in server");
403-
test_matrix($node,$server_config,['testuser','gssuser','nogssuser' ],
393+
test_matrix($node, ['testuser','gssuser','nogssuser' ],
404394
\@all_gssencmodes,$sslmodes,$sslnegotiations,
405395
parse_table($test_table));
406396
}
@@ -423,7 +413,6 @@ BEGIN
423413
# Enable SSL
424414
$node->adjust_conf('postgresql.conf','ssl','on');
425415
$node->reload;
426-
$server_config->{server_ssl} = 1;
427416

428417
$test_table =q{
429418
# USER GSSENCMODE SSLMODE SSLNEGOTIATION EVENTS -> OUTCOME
@@ -510,7 +499,6 @@ BEGIN
510499
note("Running tests with both GSS and SSL enabled in server");
511500
test_matrix(
512501
$node,
513-
$server_config,
514502
['testuser','gssuser','ssluser','nogssuser','nossluser' ],
515503
\@all_gssencmodes,
516504
\@all_sslmodes,
@@ -546,8 +534,8 @@ sub test_matrix
546534
{
547535
local$Test::Builder::Level =$Test::Builder::Level + 1;
548536

549-
my ($pg_node,$node_conf,
550-
$test_users,$gssencmodes,$sslmodes,$sslnegotiations,%expected)
537+
my ($pg_node,$test_users,$gssencmodes,$sslmodes,$sslnegotiations,
538+
%expected)
551539
=@_;
552540

553541
foreachmy$test_user (@{$test_users})

‎src/tools/msvc_gendef.pl

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
use List::Utilqw(min);
77
use Getopt::Long;
88

9-
my@def;
10-
119
#
1210
# Script that generates a .DEF file for all objects in a directory
1311
#

‎src/tools/pgindent/pgindent

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@ my $indent_opts =
2121

2222
my$devnull = File::Spec->devnull;
2323

24-
my ($typedefs_file,$typedef_str,@excludes,
25-
$indent,$build,$diff,
24+
my ($typedefs_file,$typedef_str,@excludes,$indent,$diff,
2625
$check,$help,@commits,);
2726

2827
$help = 0;

0 commit comments

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