[Pgp-tools-commit] r472 - in trunk: caff debian

[Peter Palfrader]

Author: weasel
Date: 2010-07-31 11:35:17 +0000 (Sat, 31 Jul 2010)
New Revision: 472

Modified:
   trunk/caff/caff
   trunk/debian/changelog
Log:
caff: Fix horrible &function calls used because of broken prototypes

Modified: trunk/caff/caff
===================================================================
--- trunk/caff/caff	2010-07-31 11:35:08 UTC (rev 471)
+++ trunk/caff/caff	2010-07-31 11:35:17 UTC (rev 472)
@@ -972,7 +972,7 @@
 #         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 @@
 # @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 @@
     # 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 @@
 
     # 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 (@{$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 @@
 }
 	
 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) {

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2010-07-31 11:35:08 UTC (rev 471)
+++ trunk/debian/changelog	2010-07-31 11:35:17 UTC (rev 472)
@@ -25,8 +25,9 @@
     + 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 at debian.org>  Sat, 31 Jul 2010 13:11:28 +0200
+ -- Peter Palfrader <weasel at debian.org>  Sat, 31 Jul 2010 13:12:41 +0200
 
 signing-party (1.1.3-1) unstable; urgency=low