From e53e902898c6b5d46a4e7963f5f5348e4bfb0d94 Mon Sep 17 00:00:00 2001 From: Steve Hancock Date: Mon, 24 Jul 2023 20:12:18 -0700 Subject: [PATCH] fix c236 --- lib/Perl/Tidy.pm | 6 +++--- lib/Perl/Tidy/HtmlWriter.pm | 2 +- lib/Perl/Tidy/LineSource.pm | 2 +- lib/Perl/Tidy/Tokenizer.pm | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/Perl/Tidy.pm b/lib/Perl/Tidy.pm index c0caee43..47c54713 100644 --- a/lib/Perl/Tidy.pm +++ b/lib/Perl/Tidy.pm @@ -1513,7 +1513,7 @@ sub get_decoded_string_buffer { my $line_separator = $self->[_line_separator_default_]; my $count = 0; - while ( my $line = $fh->getline() ) { + while ( defined( my $line = $fh->getline() ) ) { $buf .= $line; # Find and change the line separator if requested with -ple @@ -5023,7 +5023,7 @@ sub dump_config_file { print STDOUT "${$rconfig_file_chatter}"; if ($fh) { print STDOUT "# Dump of file: '$config_file'\n"; - while ( my $line = $fh->getline() ) { print STDOUT $line } + while ( defined( my $line = $fh->getline() ) ) { print STDOUT $line } my $ok = eval { $fh->close(); 1 }; if ( !$ok && DEVEL_MODE ) { Fault("Could not close file handle(): $EVAL_ERROR\n"); @@ -5046,7 +5046,7 @@ sub read_config_file { my $name = undef; my $line_no; my $opening_brace_line; - while ( my $line = $fh->getline() ) { + while ( defined( my $line = $fh->getline() ) ) { $line_no++; chomp $line; ( $line, $death_message ) = diff --git a/lib/Perl/Tidy/HtmlWriter.pm b/lib/Perl/Tidy/HtmlWriter.pm index 073182dd..476dafde 100644 --- a/lib/Perl/Tidy/HtmlWriter.pm +++ b/lib/Perl/Tidy/HtmlWriter.pm @@ -791,7 +791,7 @@ sub pod_to_html { my $date = localtime; $timestamp = "on $date"; } - while ( my $line = $fh_tmp->getline() ) { + while ( defined( my $line = $fh_tmp->getline() ) ) { if ( $line =~ /^\s*\s*$/i ) { ##my $date = localtime; diff --git a/lib/Perl/Tidy/LineSource.pm b/lib/Perl/Tidy/LineSource.pm index 1688c4d8..64ba88d7 100644 --- a/lib/Perl/Tidy/LineSource.pm +++ b/lib/Perl/Tidy/LineSource.pm @@ -92,7 +92,7 @@ sub get_line { # patch to read raw mac files under unix, dos # see if the first line has embedded \r's - if ( $line && !$self->{_started} ) { + if ( defined($line) && !$self->{_started} ) { if ( $line =~ /[\015][^\015\012]/ ) { # found one -- break the line up and store in a buffer diff --git a/lib/Perl/Tidy/Tokenizer.pm b/lib/Perl/Tidy/Tokenizer.pm index a692273e..aa87d4c1 100644 --- a/lib/Perl/Tidy/Tokenizer.pm +++ b/lib/Perl/Tidy/Tokenizer.pm @@ -991,7 +991,7 @@ sub get_line { my $input_line = $self->get_next_line(); $self->[_line_of_text_] = $input_line; - return unless ($input_line); + return unless ( defined($input_line) ); my $input_line_number = ++$self->[_last_line_number_]; -- 2.39.5