Coding style fixes for Perl wallet code

Strip trailing whitespace, convert tabs to spaces, add newlines to
exceptions, and remove a few stray blank lines and a few other minor
coding style oddities.  Make the SQL style consistent.

2 files changed, 12 insertions, 13 deletions

diff --git a/perl/Wallet/Object/Base.pm b/perl/Wallet/Object/Base.pm
index f2568eb..fea0320 100644
--- a/perl/Wallet/Object/Base.pm
+++ b/perl/Wallet/Object/Base.pm
@@ -445,7 +445,7 @@ sub flag_set {
 # History
 ##############################################################################
 
-# Expand a given ACL id to add its name, for readability.  Returns the 
+# Expand a given ACL id to add its name, for readability.  Returns the
 # original id alone if there was a problem finding the name.
 sub format_acl_id {
     my ($self, $id) = @_;
@@ -455,7 +455,7 @@ sub format_acl_id {
     my $sth = $self->{dbh}->prepare ($sql);
     $sth->execute ($id);
     if (my @ref = $sth->fetchrow_array) {
-	$name = $ref[0] . " ($id)";
+        $name = $ref[0] . " ($id)";
     }
 
     return $name;
@@ -492,11 +492,11 @@ sub history {
                 } elsif (defined ($new)) {
                     $output .= "add $new to attribute $attr";
                 }
-            } elsif ($data[0] eq 'set' 
-		     and ($data[1] eq 'owner' or $data[1] =~ /^acl_/)) {
+            } elsif ($data[0] eq 'set'
+                     and ($data[1] eq 'owner' or $data[1] =~ /^acl_/)) {
                 my $field = $data[1];
-		$old = $self->format_acl_id ($old) if defined ($old);
-		$new = $self->format_acl_id ($new) if defined ($new);
+                $old = $self->format_acl_id ($old) if defined ($old);
+                $new = $self->format_acl_id ($new) if defined ($new);
                 if (defined ($old) and defined ($new)) {
                     $output .= "set $field to $new (was $old)";
                 } elsif (defined ($new)) {
diff --git a/perl/Wallet/Object/Keytab.pm b/perl/Wallet/Object/Keytab.pm
index b1c9d6d..a361599 100644
--- a/perl/Wallet/Object/Keytab.pm
+++ b/perl/Wallet/Object/Keytab.pm
@@ -1,7 +1,7 @@
 # Wallet::Object::Keytab -- Keytab object implementation for the wallet.
 #
 # Written by Russ Allbery <rra@stanford.edu>
-# Copyright 2007, 2008 Board of Trustees, Leland Stanford Jr. University
+# Copyright 2007, 2008, 2009 Board of Trustees, Leland Stanford Jr. University
 #
 # See LICENSE for licensing terms.
 
@@ -477,15 +477,14 @@ sub new {
 # caller.
 sub create {
     my ($class, $type, $name, $dbh, $creator, $host, $time) = @_;
-    my $self = { 
-	dbh    => $dbh,
-	kadmin => undef,
+    my $self = {
+        dbh    => $dbh,
+        kadmin => undef,
     };
     bless $self, $class;
     my $kadmin = Wallet::Kadmin->new ();
     $self->{kadmin} = $kadmin;
     $kadmin->addprinc ($name);
-    
     $self = $class->SUPER::create ($type, $name, $dbh, $creator, $host, $time);
     $self->{kadmin} = $kadmin;
     return $self;
@@ -556,8 +555,8 @@ sub get {
     my $kadmin = $self->{kadmin};
     my $retval = eval { $kadmin->ktadd ($self->{name}, $file, @enctypes) };
     if ($@) {
-	$self->error ($@);
-	return;
+        $self->error ($@);
+        return;
     }
     return unless $retval;
     local *KEYTAB;