Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1jO2F3-0004K7-N5 for pgsql-hackers@arkaria.postgresql.org; Mon, 13 Apr 2020 16:47:25 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.92) (envelope-from ) id 1jO2F2-0005wY-Kq for pgsql-hackers@arkaria.postgresql.org; Mon, 13 Apr 2020 16:47:24 +0000 Received: from makus.postgresql.org ([2001:4800:3e1:1::229]) by malur.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1jO2F2-0005wR-Dp for pgsql-hackers@lists.postgresql.org; Mon, 13 Apr 2020 16:47:24 +0000 Received: from mail-ot1-x342.google.com ([2607:f8b0:4864:20::342]) by makus.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.92) (envelope-from ) id 1jO2Ew-0006Pt-0k for pgsql-hackers@postgresql.org; Mon, 13 Apr 2020 16:47:23 +0000 Received: by mail-ot1-x342.google.com with SMTP id 103so9744455otv.0 for ; Mon, 13 Apr 2020 09:47:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=2ndquadrant-com.20150623.gappssmtp.com; s=20150623; h=from:subject:to:cc:references:autocrypt:message-id:date:user-agent :mime-version:in-reply-to:content-transfer-encoding:content-language; bh=aK3fOw20mU534c0zQvae3A5s1rxrY5ER7OtUNiaDenI=; b=CoFRxbRdlRZINDpptBAng0zP4fziY6FN49MvTVxTB1UzG/vvMMvtX6WSEJp3Q1EOkS nzAz3SAmjr/6t64XEPphkafoZum1pwNZOf1IlEVN0M1YPFomAuryaitwcrEBfKmiqpot 5ttEW5UzsAWtUwWYSipxyQNoLzqQn0Ltq05Fse7dg1GdrHZTNcvBF6DK6KL6wPm1EVnF p6P65L+n29qW9PkUXEPpUDpEVUjZQuCTxgks6uD0SPdXRpPKJM7GAwkSYGmZW8aks9Ty mrsTbwitAgPGKSdD/UacPRJOCcmNUexUig7tafppf9/CB3J2++GIGfpv7DH1A5C29/ZS f36g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:subject:to:cc:references:autocrypt :message-id:date:user-agent:mime-version:in-reply-to :content-transfer-encoding:content-language; bh=aK3fOw20mU534c0zQvae3A5s1rxrY5ER7OtUNiaDenI=; b=JgttwxqkedjXZvwut4jL6Wjos9gw6IoyGXy4O/h98BEcnk1EkUkQmu3Lwwh6j1wpi2 cHPRz+DuyzZUmKciitO4I794Vf681mdwfqiFk0sDSy0mJnwPiBvyN25jXrJbbPjKWXiG BD0QrDlJDS9VZ+C+4AwWZGHfigG0rLYCFXhm0Ov+/ZVMhi6oirGu5DtfHPzX0HPSjQT8 Zp5H/R5ZFEv0Tqq2QHGKljVAYP+jiRkDNxYk1k4pU488H26gxffZdIZDIvLg4PRtqjf8 BGhjlLvCrsmsEPKK9354JClNEKcbQ9Ut0GbgAI8pVFLbpzUjugAM02VyrfkOIVzW3skY j4iw== X-Gm-Message-State: AGi0Pua4kK+/5NK3CJ/ol6oie9ERE+RZDjEjygwEAvi0c8JjaRA+BcAT 8hWoHaOg6bGxQMZ2VgARQnSOPoTqstF2Yd/WqUykGqeM5ZfWAA1b4wFM4gNl3/5uGoUAPPcfG2y Jmf/8MCwuwitY96YlBrB+bdZMXrG6hLwGYuexmuYxENtqH8e/t3eyPu4EQikhF6CZsYD5vjGp43 GoJSdV33Dx6FXnoBc= X-Google-Smtp-Source: APiQypIlfVsTT64DCf1/mu9UMh5MZ0/tlDtaDl9Q7FJFI2YfFmvQswedfOW9gp4AJnLsqJ9rza05Ew== X-Received: by 2002:a9d:7f92:: with SMTP id t18mr13135134otp.55.1586796436927; Mon, 13 Apr 2020 09:47:16 -0700 (PDT) Received: from [192.168.10.146] (99-10-92-30.lightspeed.rlghnc.sbcglobal.net. [99.10.92.30]) by smtp.gmail.com with ESMTPSA id k185sm4919703oib.5.2020.04.13.09.47.15 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 13 Apr 2020 09:47:16 -0700 (PDT) From: Andrew Dunstan X-Google-Original-From: Andrew Dunstan Subject: Re: cleaning perl code To: Noah Misch Cc: PostgreSQL-development References: <20200411043014.GA590991@rfd.leadboat.com> <0a4406d5-b428-4831-8ed9-c36764360f57@2ndQuadrant.com> <20200412074245.GB623763@rfd.leadboat.com> Autocrypt: addr=andrew.dunstan@2ndQuadrant.com; prefer-encrypt=mutual; keydata= mQENBE7KWFkBCAClridxur2AIc7eW2AR7izbfp3EnNefie2HbLF0izW5Ik5UjX2HBXBx4syI gY6b0ugohXrr274+baoAlvSbq6cAoQuEVrk5IZFzt20b1Xkx65FwGSEj526yiKLocqkJceSq Xr9xcA5SGY+FZv441chh5SU92v4q6z+6LPpoHOh97ptAVXZYNTtU0LevyvD5lja0TzbvJm6C eFXitJfnm1pLEr0DGJCR/iUOl/N62Kh4855zZC7NHIjQHPOvV5Stz/l5ilDhvGVk+xkXFPys SjZoUr1rXhYLpiyi5sR0X9FHXT0KnGuz1F5ERO7ZTLSSQ6fJwPj6gOk9K+vvoKvoeql5ABEB AAG0L0FuZHJldyBEdW5zdGFuIDxhbmRyZXcuZHVuc3RhbkAybmRRdWFkcmFudC5jb20+iQFY BBMBAgBCAhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgBYhBOQ+WEYd/Hy/RGkVpZn6f8tZ /DuBAhkBBQJd1pSYBQkSzqMsAAoJEJn6f8tZ/DuBJmEIAIVFBIC3qGqh+YTPVTkfowwxpHz0 tZSPjZ6GS/5y62kgoZrZOVXw+Rg2ceuMM3a+In/RRjTx4bembgYqRKgzXlDfiNBJeq5ioVuN H1faDKE2lm5a6QkRQ2JU6DKf60fqSJGP5LisCUr1V0wz6EnlO31ArrKtXCNB+yk0KDAS6o6I Ql4pkXpr+vq4iilwJmiJOqTBam0LmQE7ulYCCYU8Z6MkpiSl+dO7QSramcGyxauQRI3a7gcq dpo8Vrv3gFTQDeMYxk7cqZp08pIVH5XR0+LgBz4X84f59rA/VAKlC/r6CyEQk59rvDLxCMyP 2buoj51Z25N3MVghRDGcsU6mT7e5AQ0ETspYWQEIANGc4zQULOxhbqO2dyD51YhqCNRmm9oK Waqf+wmW4tpDe/VVcxAnNizd4LWCHfzpb5cHAtGkOPePMfzWVf6nvdF7d3eglbtf59+zG7O7 llV0xSSoFiieQBsrGvqDInXYX/4mRRXMtyhM353/tixC9RWLs1oofyYmCPPXXY7h9R7en3B8 BoVrRFcdzlIY/NFNhFGW/9dkEiGjgna2Rk6e15kln4ZvFBWUg23p93w/pqXcxY6+k/8TEk+C 4R+M6w7o2PLGOjdZ+kPiUcw5H85zf/yZJwQXzisXaNduwWB6Vads9YC9dj6kPR1c4VGRqAaY L++LAEOqrlvm2TvqQqZRtnEAEQEAAYkBJQQYAQIADwIbDAUCXdaUtAUJEs6jVQAKCRCZ+n/L Wfw7gQi5B/9sHbmRloZNCWWwZGm+O9iG/JGQxS0WWa4GaZqzqSTWOft2/gO0Bgag89r1djq4 PFgSZtzHvKQpqYz/7HkPrWh1jpcS83i/uYY1uyHXUUtpdEmn4buNObEtD0YNaJkGdhASsECq 6akw+u7WJYmAHs/SpR6ok6HqLw7JHDVc2h5dViLfTk0qrgDa7sq/LVMoJje5Ct/Ku3YaWAV6 YSmzoPP5BmPVFqP11OMQkCqurIu9vTLXKFWX623vCmqRDHJ6e5GCDHbH8USU+4wJBfPymZkd cA7NGm/mmWeJiWBFIDyjzYxrjku8ty9TZJVsaRXnS+OFQzXz9Eu2wTpKdHij46uY Message-ID: <44c13be6-d7a4-dcd3-cff0-c997e8835e5f@2ndQuadrant.com> Date: Mon, 13 Apr 2020 12:47:15 -0400 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.6.0 MIME-Version: 1.0 In-Reply-To: <20200412074245.GB623763@rfd.leadboat.com> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Content-Language: en-US List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Precedence: bulk On 4/12/20 3:42 AM, Noah Misch wrote: > On Sat, Apr 11, 2020 at 12:13:08PM -0400, Andrew Dunstan wrote: >> --- a/src/tools/msvc/Project.pm >> +++ b/src/tools/msvc/Project.pm >> @@ -420,13 +420,10 @@ sub read_file >> { >> my $filename = shift; >> my $F; >> - my $t = $/; >> - >> - undef $/; >> + local $/ = undef; >> open($F, '<', $filename) || croak "Could not open file $filename\n"; >> my $txt = <$F>; >> close($F); >> - $/ = $t; > +1 for this and for the other three hunks like it. The resulting code is > shorter and more robust, so this is a good one-time cleanup. It's not > important to mandate this style going forward, so I wouldn't change > perlcriticrc for this one. > >> --- a/src/tools/version_stamp.pl >> +++ b/src/tools/version_stamp.pl >> @@ -1,4 +1,4 @@ >> -#! /usr/bin/perl -w >> +#! /usr/bin/perl >> >> ################################################################# >> # version_stamp.pl -- update version stamps throughout the source tree >> @@ -21,6 +21,7 @@ >> # >> >> use strict; >> +use warnings; > This and the other "use warnings" additions look good. I'm assuming you'd > change perlcriticrc like this: > > +[TestingAndDebugging::RequireUseWarnings] > +severity = 5 OK, I've committed all that stuff. I think that takes care of the non-controversial part of what I proposed :-) cheers andrew -- Andrew Dunstan https://www.2ndQuadrant.com PostgreSQL Development, 24x7 Support, Remote DBA, Training & Services