caff: Fix horrible &function calls used because of broken prototypes

git-svn-id: svn://svn.debian.org/pgp-tools/trunk@472 b513b33f-fedd-0310-b452-c3deb5f4c849

diff --git a/caff/caff b/caff/caff
index a27bea514b768fa3f653d0b54d5ca2512323ef6e..99710ced34221c131e99cf06ab6a27432db72440 100755 (executable)
--- a/caff/caff
+++ b/caff/caff
@@ -972,7 +972,7 @@ sub get_local_user_keys() {
 #         1 if the key could not be exported.\n
 #         2 if the key could not be imported.
 #
-sub import_key_from_user_gnupghome() {
+sub import_key_from_user_gnupghome($$) {
     my $err;
     my ($asciikey, $dst_gpghome) = @_;
 
@@ -1002,7 +1002,7 @@ sub import_key_from_user_gnupghome() {
 # @return 0 if successful\n
 #         1 if an error occured.
 #
-sub import_key_files() {
+sub import_key_files($$) {
     my $err;
     my ($keyfile, $dst_gpghome) = @_;
 
@@ -1041,7 +1041,7 @@ sub import_keys_to_sign() {
     # try to import it into our working gnupghome directory
     my $imported_keys = 0;
     foreach my $keyid (@KEYIDS) {
-        if (!&import_key_from_user_gnupghome($keyid, $GNUPGHOME)) {
+        if (!import_key_from_user_gnupghome($keyid, $GNUPGHOME)) {
             info("Key $keyid imported from your normal GnuPGHOME.");
             $imported_keys++;
         }
@@ -1053,7 +1053,7 @@ sub import_keys_to_sign() {
 
     # Import user specified key files
     foreach my $keyfile (@{$CONFIG{'key-files'}}) {
-        &import_key_files($keyfile, $GNUPGHOME);
+        import_key_files($keyfile, $GNUPGHOME);
     }
 
     return 0;
@@ -1132,7 +1132,7 @@ for my $keyid (map { split /\n/ } @ARGV) { # caff "`cat txt`" is a single argume
 #################
 for my $keyid (@{$CONFIG{'keyid'}}) {
     info("Importing key $keyid from your normal GnuPGHome.");
-    if (&import_key_from_user_gnupghome($keyid, $GNUPGHOME)) {
+    if (import_key_from_user_gnupghome($keyid, $GNUPGHOME)) {
         mywarn("Key $keyid not found.");
     }
 }
@@ -1216,7 +1216,7 @@ if ($CONFIG{'ask-sign'} && ! $CONFIG{'no-sign'}) {
 }
        
 unless ($CONFIG{'no-sign'}) {
-       my @local_user = &get_local_user_keys();
+       my @local_user = get_local_user_keys();
 
        info("Sign the following keys according to your policy, then exit gpg with 'save' after signing each key");
        for my $keyid (@keyids_ok) {

diff --git a/debian/changelog b/debian/changelog
index 00c27d4d33d7fd180ea733ff8df43c5a089e50ba..479ed2917bf71b892a16d85d5950045aa7ede3d1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,8 +25,9 @@ signing-party (1.1.4-1) UNRELEASED; urgency=low
     + manpage: Refer to all of /usr/share/doc/signing-party/caff/ and not
       just to /usr/share/doc/signing-party/caff/caffrc.sample
       (closes: #568052).
+    + Fix horrible &function calls used because of broken prototypes.
 
- -- Peter Palfrader <weasel@debian.org>  Sat, 31 Jul 2010 13:11:28 +0200
+ -- Peter Palfrader <weasel@debian.org>  Sat, 31 Jul 2010 13:12:41 +0200
 
 signing-party (1.1.3-1) unstable; urgency=low