romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-26 10:13:31 +03:00
Code Issues Projects Releases Packages Wiki Activity

wording: avoid blacklist/whitelist stereotypes

Browse source 
Instead of discussing if there's value or meaning (implied or not) in
the colors, let's use words without the same possibly negative
associations.

Closes #5546
This commit is contained in:
Daniel Stenberg 2020-06-09 16:08:11 +02:00
parent f54b6c4bc2
commit eab2f95c0d
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
17 changed files with 67 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

18
lib/checksrc.pl
View file

@ -31,14 +31,14 @@ my $warnings = 0;
my $swarnings = 0;
my $errors = 0;
my $serrors = 0;
my $suppressed; # whitelisted problems
my $suppressed; # skipped problems
my $file;
my $dir=".";
my $wlist="";
my @alist;
my $windows_os = $^O eq 'MSWin32' || $^O eq 'cygwin' || $^O eq 'msys';
my $verbose;
my %whitelist;
my %skiplist;
my %ignore;
my %ignore_set;
@ -84,12 +84,12 @@ my %warnings = (
'TYPEDEFSTRUCT' => 'typedefed struct',
);
sub readwhitelist {
open(W, "<$dir/checksrc.whitelist") or return;
sub readskiplist {
open(W, "<$dir/checksrc.skip") or return;
my @all=<W>;
for(@all) {
$windows_os ? $_ =~ s/\r?\n$// : chomp;
$whitelist{$_}=1;
$skiplist{$_}=1;
}
close(W);
}
@ -142,8 +142,8 @@ sub checkwarn {
# print STDERR "Dev! there's no description for $name!\n";
#}
# checksrc.whitelist
if($whitelist{$line}) {
# checksrc.skip
if($skiplist{$line}) {
$nowarn = 1;
}
# !checksrc! controlled
@ -228,7 +228,7 @@ if(!$file) {
print " -A[rule] Accept this violation, can be used multiple times\n";
print " -D[DIR] Directory to prepend file names\n";
print " -h Show help output\n";
print " -W[file] Whitelist the given file - ignore all its flaws\n";
print " -W[file] Skip the given file - ignore all its flaws\n";
print " -i<n> Indent spaces. Default: 2\n";
print " -m<n> Maximum line length. Default: 79\n";
print "\nDetects and warns for these problems:\n";
@ -238,7 +238,7 @@ if(!$file) {
exit;
}
readwhitelist();
readskiplist();
readlocalfile();
do {

5
lib/http.c
View file

@ -3698,9 +3698,8 @@ CURLcode Curl_http_readwrite_headers(struct Curl_easy *data,
else if(conn->httpversion == 20 ||
(k->upgr101 == UPGR101_REQUESTED && k->httpcode == 101)) {
DEBUGF(infof(data, "HTTP/2 found, allow multiplexing\n"));
/* HTTP/2 cannot blacklist multiplexing since it is a core
functionality of the protocol */
/* HTTP/2 cannot avoid multiplexing since it is a core functionality
of the protocol */
conn->bundle->multiuse = BUNDLE_MULTIPLEX;
}
else if(conn->httpversion >= 11 &&