[lintian] 02/02: c/menu-format.pm: Minor refactor of verify_desktop_file

[Niels Thykier <nthykier@moszumanska.debian.org>]

This is an automated email from the git hooks/post-receive script.

nthykier pushed a commit to branch master
in repository lintian.

commit dec1e4d2f8cfe1c6512314a35b399c65c020df75
Author: Niels Thykier <niels@thykier.net>
Date:   Thu Sep 18 20:23:01 2014 +0200

    c/menu-format.pm: Minor refactor of verify_desktop_file
    
    Signed-off-by: Niels Thykier <niels@thykier.net>
---
 checks/menu-format.pm | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/checks/menu-format.pm b/checks/menu-format.pm
index 0253965..7897647 100644
--- a/checks/menu-format.pm
+++ b/checks/menu-format.pm
@@ -184,7 +184,7 @@ sub run {
 
     # Verify all the desktop files.
     for my $desktop_file (@desktop_files) {
-        verify_desktop_file($desktop_file, $desktop_file, $pkg, $info);
+        verify_desktop_file($desktop_file, $pkg, $info);
     }
 
     # Now all the menu files.
@@ -564,12 +564,10 @@ sub verify_icon {
 
 # Syntax-checks a .desktop file.
 sub verify_desktop_file {
-    my ($desktopfile, $file, $pkg, $info) = @_;
-    my ($line, $saw_first, $warned_cr);
-    my %vals;
-    my @pending;
-    open(my $fd, '<', $info->unpacked($file));
-    while (defined($line = <$fd>)) {
+    my ($file, $pkg, $info) = @_;
+    my ($saw_first, $warned_cr, %vals, @pending);
+    my $fd = $file->open;
+    while (my $line = <$fd>) {
         chomp $line;
         next if ($line =~ m/^\s*\#/ or $line =~ m/^\s*$/);
         if ($line =~ s/\r//) {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git