From c4027b7300984d4bc0a5b64dd3ca6e6a0875fabc Mon Sep 17 00:00:00 2001
From: Florian Weimer <fw@deneb.enyo.de>
Date: Tue, 13 May 2008 15:58:56 +0200
Subject: [PATCH] Remove unnecessary ->close call

---
 dowkd.in | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/dowkd.in b/dowkd.in
index 7600ae3..6dcc84d 100644
--- a/dowkd.in
+++ b/dowkd.in
@@ -48,7 +48,6 @@ my $db;
 my %db;
 
 sub create_db () {
-    $db->close if $db;
     $db = tie %db, 'DB_File', $db_file, O_RDWR | O_CREAT, 0777, $DB_BTREE
 	or die "error: could not open database: $!\n";
 
@@ -89,8 +88,7 @@ sub safe_backtick (@) {
 	@result = scalar(<$fh>);
     }
     close $fh;
-    $? == 0 or die("error: $args[0] failed with exit status " 
-		   . ($? >> 8) . "\n");
+    $? == 0 or return undef;
     if (wantarray) {
 	return @result;
     } else {
@@ -108,6 +106,7 @@ sub check_hash ($$) {
 sub ssh_fprint_file ($) {
     my $name = shift;
     my $data = safe_backtick qw/ssh-keygen -l -f/, $name;
+    defined $data or return ();
     my @data = $data =~ /^(\d+) ([0-9a-f]{2}(?::[0-9a-f]{2}){15})/;
     return @data if @data == 2;
     return ();
@@ -126,7 +125,6 @@ sub ssh_fprint_check ($$$) {
 
 sub from_ssh_key_file ($) {
     my $name = shift;
-    my $data = safe_backtick qw/ssh-keygen -l -f/, $name;
     my ($length, $hash) = ssh_fprint_file $name;
     if ($length && $hash) {
 	ssh_fprint_check "$name:1", $length, $hash;
-- 
2.11.4.GIT