[Pgp-tools-commit] r818 - trunk/gpglist

[Guilhem Moulin]

Author: guilhem-guest
Date: 2015-08-24 18:49:09 +0000 (Mon, 24 Aug 2015)
New Revision: 818

Modified:
   trunk/gpglist/gpglist
Log:
gpglist: minor refactorization.

Modified: trunk/gpglist/gpglist
===================================================================
--- trunk/gpglist/gpglist	2015-08-24 12:49:09 UTC (rev 817)
+++ trunk/gpglist/gpglist	2015-08-24 18:49:09 UTC (rev 818)
@@ -146,17 +146,21 @@
 }
 close SIGS;
 
-sub revoked($) {
-    my $k = shift;
-    (!defined $revs{$longkey}->{$k} or $revs{$longkey}->{$k} < $sigs{$longkey}->{$k}) ? 0 : 1
+sub is_revoked($;$) {
+	my $uid = shift;
+	my $keyid = shift // $longkey;
+	defined $revs{$keyid}->{$uid} and defined $sigs{$keyid}->{$uid} and
+	$sigs{$keyid}->{$uid} > 0 and # < 0 means non-revocable
+	$revs{$keyid}->{$uid} > $sigs{$keyid}->{$uid}
+		? 1 : 0;
 }
- at uids = grep { !revoked($_) } @uids unless $show_revoked;
+ at uids = grep { !is_revoked($_) } @uids unless $show_revoked;
 
 for ( my $a=0; $a <= $#uids; $a++ ) {
 	printf "|  " x $a
 	     . "+--"
 	     . "---" x ($#uids-$a)
-	     . (revoked($uids[$a]) ? 'R' : ' ')
+		 . (is_revoked($uids[$a]) ? 'R' : ' ')
 	     . "%2i $uids{$uids[$a]}\n", $a+1;
 }
 
@@ -167,14 +171,10 @@
 
 for my $id (sort {$ids{$a} cmp $ids{$b}} keys %ids) {
 	foreach my $uid (@uids) {
-		if (defined $revs{$id}->{$uid} and defined $sigs{$id}->{$uid} and
-				$sigs{$id}->{$uid} > 0 and # < 0 means non-revocable
-				$revs{$id}->{$uid} > $sigs{$id}->{$uid}) {
-			print 'R';
-		} else {
-			print (defined $sigs{$id}->{$uid} ? 'x' : ' ');
-		}
-		print '  ';
+		my $x = is_revoked($uid,$id) ? 'R' :
+				defined $sigs{$id}->{$uid} ? 'x' :
+				' ';
+		print $x.'  ';
 	}
 	print "$id $ids{$id}\n";
 }