Changeset 5880

Timestamp:

07/06/09 10:39:27 (3 years ago)

Author:

szabgab

Message:

fix some open() calls and add some error handling

Location:

trunk/Locale-Msgfmt

Files:

• Changes (modified) (1 diff)
• lib/Locale/Msgfmt.pm (modified) (1 diff)
• lib/Locale/Msgfmt/mo.pm (modified) (1 diff)
• lib/Locale/Msgfmt/po.pm (modified) (2 diffs)
• t/interface.t (modified) (1 diff)

trunk/Locale-Msgfmt/Changes

@@ -1 +1 @@
 Revision history for Locale-Msgfmt
+
+        - some code improvement in open() and opendir() and error handling (SZABGAB)
 
 0.10    Jul 5, 2009

trunk/Locale-Msgfmt/lib/Locale/Msgfmt.pm

@@ -73 +73 @@
         File::Path::mkpath( $hash->{out} );
     }
-    opendir D, $hash->{in};
-    my @list = readdir D;
-    closedir D;
+    opendir my $D, $hash->{in} or die "Could not open ($hash->{in}) $!";
+    my @list = readdir $D;
+    closedir $D;
     my @removelist = ();
     if ( $hash->{remove} ) {

trunk/Locale-Msgfmt/lib/Locale/Msgfmt/mo.pm

@@ -38 +38 @@
     my $self = shift;
     my $file = shift;
-    open OUT, ">", $file;
-    binmode OUT;
-    print OUT Locale::Msgfmt::Utils::from_hex( $self->{magic} );
-    print OUT Locale::Msgfmt::Utils::character( $self->{format} );
-    print OUT Locale::Msgfmt::Utils::character( $self->{count} );
-    print OUT Locale::Msgfmt::Utils::character(28);
-    print OUT Locale::Msgfmt::Utils::character( 28 + $self->{count} * 8 );
-    print OUT Locale::Msgfmt::Utils::character(0);
-    print OUT Locale::Msgfmt::Utils::character(0);
+    open my $OUT, ">", $file or die "Could not open ($file) $!";
+    binmode $OUT;
+    print $OUT Locale::Msgfmt::Utils::from_hex( $self->{magic} );
+    print $OUT Locale::Msgfmt::Utils::character( $self->{format} );
+    print $OUT Locale::Msgfmt::Utils::character( $self->{count} );
+    print $OUT Locale::Msgfmt::Utils::character(28);
+    print $OUT Locale::Msgfmt::Utils::character( 28 + $self->{count} * 8 );
+    print $OUT Locale::Msgfmt::Utils::character(0);
+    print $OUT Locale::Msgfmt::Utils::character(0);
 
     foreach ( @{ $self->{sorted} } ) {
         my $length = length($_);
-        print OUT Locale::Msgfmt::Utils::character($length);
-        print OUT Locale::Msgfmt::Utils::character( $self->{free_mem} );
+        print $OUT Locale::Msgfmt::Utils::character($length);
+        print $OUT Locale::Msgfmt::Utils::character( $self->{free_mem} );
         $self->{free_mem} += $length + 1;
     }
     foreach ( @{ $self->{translations} } ) {
         my $length = length($_);
-        print OUT Locale::Msgfmt::Utils::character($length);
-        print OUT Locale::Msgfmt::Utils::character( $self->{free_mem} );
+        print $OUT Locale::Msgfmt::Utils::character($length);
+        print $OUT Locale::Msgfmt::Utils::character( $self->{free_mem} );
         $self->{free_mem} += $length + 1;
     }
     foreach ( @{ $self->{sorted} } ) {
-        print OUT Locale::Msgfmt::Utils::null_terminate($_);
+        print $OUT Locale::Msgfmt::Utils::null_terminate($_);
     }
     foreach ( @{ $self->{translations} } ) {
-        print OUT Locale::Msgfmt::Utils::null_terminate($_);
+        print $OUT Locale::Msgfmt::Utils::null_terminate($_);
     }
-    close OUT;
+    close $OUT;
 }
 

trunk/Locale-Msgfmt/lib/Locale/Msgfmt/po.pm

@@ -51 +51 @@
     my $pofile = shift;
     my $mo     = $self->{mo};
-    open F, $pofile;
+    open my $F, '<', $pofile or die "Could not open ($pofile) $!";
     my %h = ();
     my $type;
-    while (<F>) {
+    while (<$F>) {
         s/\r\n/\n/;
         if (/^(msgid(?:|_plural)|msgctxt) +"(.*)" *$/) {
@@ -94 +94 @@
     }
     $self->add_string( \%h );
-    close F;
+    close $F;
 }
 

trunk/Locale-Msgfmt/t/interface.t

@@ -10 +10 @@
 
 sub slurp {
-    open F, shift;
-    binmode F;
+    my $file = shift;
+    open my $F, '<', $file or die "Could not open ($file) $!";
+    binmode $F;
     my $s = "";
-    while (<F>) { $s .= $_; }
-    close F;
+    while (<$F>) { $s .= $_; }
+    close $F;
     return $s;
 }