From 677bef0d836d1827b2d701636dfbb53380cd98cf Mon Sep 17 00:00:00 2001 From: Mike Taylor Date: Thu, 12 Oct 2006 14:37:24 +0000 Subject: [PATCH] Pass undefined $udata into irspy_connect() Accept it in callbacks. --- lib/ZOOM/IRSpy/Test/Ping.pm | 9 +++++---- lib/ZOOM/IRSpy/Test/Search/Title.pm | 8 ++++---- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/lib/ZOOM/IRSpy/Test/Ping.pm b/lib/ZOOM/IRSpy/Test/Ping.pm index 1cda0cd..77e9805 100644 --- a/lib/ZOOM/IRSpy/Test/Ping.pm +++ b/lib/ZOOM/IRSpy/Test/Ping.pm @@ -1,4 +1,4 @@ -# $Id: Ping.pm,v 1.12 2006-10-06 11:33:08 mike Exp $ +# $Id: Ping.pm,v 1.13 2006-10-12 14:37:24 mike Exp $ # See the "Main" test package for documentation @@ -16,8 +16,9 @@ sub start { my $class = shift(); my($conn) = @_; - $conn->irspy_connect(ZOOM::Event::CONNECT, \&connected, - "exception", \¬_connected); + $conn->irspy_connect(undef, + ZOOM::Event::CONNECT, \&connected, + exception => \¬_connected); } @@ -25,7 +26,7 @@ sub connected { maybe_connected(@_, 1) } sub not_connected { maybe_connected(@_, 0) } sub maybe_connected { - my($conn, $rs, $event, $ok) = @_; + my($conn, $task, $__UNUSED_udata, $event, $ok) = @_; $conn->log("irspy_test", ($ok ? "" : "not "), "connected"); my $rec = $conn->record(); diff --git a/lib/ZOOM/IRSpy/Test/Search/Title.pm b/lib/ZOOM/IRSpy/Test/Search/Title.pm index 4875598..3bc6201 100644 --- a/lib/ZOOM/IRSpy/Test/Search/Title.pm +++ b/lib/ZOOM/IRSpy/Test/Search/Title.pm @@ -1,4 +1,4 @@ -# $Id: Title.pm,v 1.5 2006-10-06 11:33:08 mike Exp $ +# $Id: Title.pm,v 1.6 2006-10-12 14:38:27 mike Exp $ # See the "Main" test package for documentation @@ -16,14 +16,14 @@ sub start { my $class = shift(); my($conn) = @_; - $conn->irspy_search_pqf('@attr 1=4 mineral', + $conn->irspy_search_pqf('@attr 1=4 mineral', undef, ZOOM::Event::RECV_SEARCH, \&found, "exception", \&error); } sub found { - my($conn, $task, $event) = @_; + my($conn, $task, $__UNUSED_udata, $event) = @_; my $n = $task->{rs}->size(); $conn->log("irspy_test", @@ -37,7 +37,7 @@ sub found { sub error { - my($conn, $task, $exception) = @_; + my($conn, $task, $__UNUSED_udata, $exception) = @_; $conn->log("irspy_test", "error: $exception"); my $rec = $conn->record(); -- 1.7.10.4