From a01d76821f7d1c0d7e3c8aa6cc7f97105722f4fc Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 25 Apr 2004 17:10:35 +0000
Subject: prefix readwrite_gpg with Echolot::Tools:: to qualify them

---
 Echolot/Conf.pm         | 2 +-
 Echolot/Pinger/CPunk.pm | 4 ++--
 Echolot/Stats.pm        | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'Echolot')

diff --git a/Echolot/Conf.pm b/Echolot/Conf.pm
index abe69c8..f6e2221 100644
--- a/Echolot/Conf.pm
+++ b/Echolot/Conf.pm
@@ -365,7 +365,7 @@ sub parse_cpunk_key($$$) {
 			commands     => [qw{--with-colons}],
 			command_args => [qw{--no-options --no-secmem-warning --no-default-keyring --fast-list-mode}],
 			handles      => $handles );
-		my ($stdout, $stderr, $status) = readwrite_gpg($key, $stdin_fh, $stdout_fh, $stderr_fh, $status_fh);
+		my ($stdout, $stderr, $status) = Echolot::Tools::readwrite_gpg($key, $stdin_fh, $stdout_fh, $stderr_fh, $status_fh);
 		waitpid $pid, 0;
 
 		($stderr eq '') or 
diff --git a/Echolot/Pinger/CPunk.pm b/Echolot/Pinger/CPunk.pm
index f07f1e3..9962675 100644
--- a/Echolot/Pinger/CPunk.pm
+++ b/Echolot/Pinger/CPunk.pm
@@ -44,7 +44,7 @@ sub encrypt_to($$$$) {
 		commands     => [ '--import' ],
 		command_args => [qw{--no-options --no-secmem-warning --no-default-keyring --fast-list-mode --keyring}, $keyring, '--', '-' ],
 		handles      => $handles );
-	my ($stdout, $stderr, $status) = readwrite_gpg($keys->{$recipient}->{'key'}, $stdin_fh, $stdout_fh, $stderr_fh, $status_fh);
+	my ($stdout, $stderr, $status) = Echolot::Tools::readwrite_gpg($keys->{$recipient}->{'key'}, $stdin_fh, $stdout_fh, $stderr_fh, $status_fh);
 	waitpid $pid, 0;
 
 	($stdout eq '') or
@@ -96,7 +96,7 @@ sub encrypt_to($$$$) {
 	$pid = $GnuPG->encrypt(
 		command_args => $command_args,
 		handles      => $handles );
-	($stdout, $stderr, $status) = readwrite_gpg('', $stdin_fh, $stdout_fh, $stderr_fh, $status_fh);
+	($stdout, $stderr, $status) = Echolot::Tools::readwrite_gpg('', $stdin_fh, $stdout_fh, $stderr_fh, $status_fh);
 	waitpid $pid, 0;
 
 	#($stderr eq '') or
diff --git a/Echolot/Stats.pm b/Echolot/Stats.pm
index 0d97783..5fc0134 100644
--- a/Echolot/Stats.pm
+++ b/Echolot/Stats.pm
@@ -861,7 +861,7 @@ sub build_pgpring_type($$$$) {
 				commands     => [ '--import' ],
 				command_args => [qw{--no-options --no-secmem-warning --no-default-keyring --fast-list-mode --keyring}, $keyring, '--', '-' ],
 				handles      => $handles );
-			my ($stdout, $stderr, $status) = readwrite_gpg($key{'key'}, $stdin_fh, $stdout_fh, $stderr_fh, $status_fh);
+			my ($stdout, $stderr, $status) = Echolot::Tools::readwrite_gpg($key{'key'}, $stdin_fh, $stdout_fh, $stderr_fh, $status_fh);
 			waitpid $pid, 0;
 
 			($stdout eq '') or
@@ -889,7 +889,7 @@ sub build_pgpring_export($$$$) {
 		commands     => [ '--export' ],
 		command_args => [qw{--no-options --no-secmem-warning --no-default-keyring --keyring}, $keyring, @$keyids ],
 		handles      => $handles );
-	my ($stdout, $stderr, $status) = readwrite_gpg('', $stdin_fh, $stdout_fh, $stderr_fh, $status_fh);
+	my ($stdout, $stderr, $status) = Echolot::Tools::readwrite_gpg('', $stdin_fh, $stdout_fh, $stderr_fh, $status_fh);
 	waitpid $pid, 0;
 
 	open (F, ">$file") or
-- 
cgit v1.2.3