summaryrefslogtreecommitdiff
path: root/crypto/lhash
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2016-02-11 21:47:30 +0100
committerRichard Levitte <levitte@openssl.org>2016-02-11 22:11:48 +0100
commit9ba96fbb2523cb12747c559c704c58bd8f9e7982 (patch)
treec93cfeeea0efd2e65b513c1fd8caf7acaf259a7c /crypto/lhash
parentc15e95a61dacfc326cf9cdf05935ae8c6c97bcf6 (diff)
downloadopenssl-new-9ba96fbb2523cb12747c559c704c58bd8f9e7982.tar.gz
Perl's chop / chomp considered bad, use a regexp instead
Once upon a time, there was chop, which somply chopped off the last character of $_ or a given variable, and it was used to take off the EOL character (\n) of strings. ... but then, you had to check for the presence of such character. So came chomp, the better chop which checks for \n before chopping it off. And this worked well, as long as Perl made internally sure that all EOLs were converted to \n. These days, though, there seems to be a mixture of perls, so lines from files in the "wrong" environment might have \r\n as EOL, or just \r (Mac OS, unless I'm misinformed). So it's time we went for the more generic variant and use s|\R$||, the better chomp which recognises all kinds of known EOLs and chops them off. A few chops were left alone, as they are use as surgical tools to remove one last slash or one last comma. NOTE: \R came with perl 5.10.0. It means that from now on, our scripts will fail with any older version. Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'crypto/lhash')
-rw-r--r--crypto/lhash/num.pl2
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/lhash/num.pl b/crypto/lhash/num.pl
index 30fedf9cd5..4440a992dc 100644
--- a/crypto/lhash/num.pl
+++ b/crypto/lhash/num.pl
@@ -5,7 +5,7 @@
while (<>)
{
next unless /^node/;
- chop;
+ s|\R$||; # Better chomp
@a=split;
$num{$a[3]}++;
}