database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-14 18:42:34 +03:00
Code Activity

Use croak instead of die in Perl code when appropriate

Browse Source
This commit is contained in:
Peter Eisentraut
2020-10-22 13:29:39 +02:00
parent e7c2b95d37
commit f8721bd752
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/test/perl/TestLib.pm
View File

@ -43,6 +43,7 @@ package TestLib;
use strict; use strict;
use warnings; use warnings;
use Carp;
use Config; use Config;
use Cwd; use Cwd;
use Exporter 'import'; use Exporter 'import';
@ -421,7 +422,7 @@ sub slurp_dir
{ {
my ($dir) = @_; my ($dir) = @_;
opendir(my $dh, $dir) opendir(my $dh, $dir)
or die "could not opendir \"$dir\": $!"; or croak "could not opendir \"$dir\": $!";
my @direntries = readdir $dh; my @direntries = readdir $dh;
closedir $dh; closedir $dh;
return @direntries; return @direntries;
@ -443,19 +444,19 @@ sub slurp_file
if ($Config{osname} ne 'MSWin32') if ($Config{osname} ne 'MSWin32')
{ {
open(my $in, '<', $filename) open(my $in, '<', $filename)
or die "could not read \"$filename\": $!"; or croak "could not read \"$filename\": $!";
$contents = <$in>; $contents = <$in>;
close $in; close $in;
} }
else else
{ {
my $fHandle = createFile($filename, "r", "rwd") my $fHandle = createFile($filename, "r", "rwd")
or die "could not open \"$filename\": $^E"; or croak "could not open \"$filename\": $^E";
OsFHandleOpen(my $fh = IO::Handle->new(), $fHandle, 'r') OsFHandleOpen(my $fh = IO::Handle->new(), $fHandle, 'r')
or die "could not read \"$filename\": $^E\n"; or croak "could not read \"$filename\": $^E\n";
$contents = <$fh>; $contents = <$fh>;
CloseHandle($fHandle) CloseHandle($fHandle)
or die "could not close \"$filename\": $^E\n"; or croak "could not close \"$filename\": $^E\n";
} }
$contents =~ s/\r\n/\n/g if $Config{osname} eq 'msys'; $contents =~ s/\r\n/\n/g if $Config{osname} eq 'msys';
return $contents; return $contents;
@ -474,7 +475,7 @@ sub append_to_file
{ {
my ($filename, $str) = @_; my ($filename, $str) = @_;
open my $fh, ">>", $filename open my $fh, ">>", $filename
or die "could not write \"$filename\": $!"; or croak "could not write \"$filename\": $!";
print $fh $str; print $fh $str;
close $fh; close $fh;
return; return;