[libnet-dbus-perl] 278/335: Kill off trailing whitespace
Intrigeri
intrigeri at moszumanska.debian.org
Sat Mar 21 01:08:10 UTC 2015
This is an automated email from the git hooks/post-receive script.
intrigeri pushed a commit to branch experimental
in repository libnet-dbus-perl.
commit c31e70250026fc88c0da91ceb6feab49106101ac
Author: Daniel P. Berrange <berrange at redhat.com>
Date: Mon May 4 18:58:23 2009 +0100
Kill off trailing whitespace
---
lib/Net/DBus/Binding/Bus.pm | 12 ++--
lib/Net/DBus/Binding/Connection.pm | 44 ++++++------
lib/Net/DBus/Binding/Iterator.pm | 42 +++++------
lib/Net/DBus/Binding/Message.pm | 36 +++++-----
lib/Net/DBus/Binding/Message/Error.pm | 8 +--
lib/Net/DBus/Binding/Message/MethodCall.pm | 6 +-
lib/Net/DBus/Binding/Message/MethodReturn.pm | 6 +-
lib/Net/DBus/Binding/Message/Signal.pm | 6 +-
lib/Net/DBus/Binding/Server.pm | 10 +--
lib/Net/DBus/Binding/Value.pm | 4 +-
lib/Net/DBus/Callback.pm | 6 +-
lib/Net/DBus/Dumper.pm | 26 +++----
lib/Net/DBus/Error.pm | 2 +-
lib/Net/DBus/Exporter.pm | 38 +++++-----
lib/Net/DBus/Reactor.pm | 102 +++++++++++++--------------
lib/Net/DBus/RemoteService.pm | 16 ++---
lib/Net/DBus/Service.pm | 6 +-
lib/Net/DBus/Test/MockConnection.pm | 42 +++++------
lib/Net/DBus/Test/MockIterator.pm | 38 +++++-----
lib/Net/DBus/Test/MockMessage.pm | 28 ++++----
lib/Net/DBus/Test/MockObject.pm | 26 +++----
lib/Net/DBus/Tutorial/ExportingObjects.pod | 60 ++++++++--------
22 files changed, 282 insertions(+), 282 deletions(-)
diff --git a/lib/Net/DBus/Binding/Bus.pm b/lib/Net/DBus/Binding/Bus.pm
index 4f29db6..87aed3f 100644
--- a/lib/Net/DBus/Binding/Bus.pm
+++ b/lib/Net/DBus/Binding/Bus.pm
@@ -70,7 +70,7 @@ sub new {
my $proto = shift;
my $class = ref($proto) || $proto;
my %params = @_;
-
+
my $connection;
if (defined $params{type}) {
if ($params{private}) {
@@ -88,7 +88,7 @@ sub new {
} else {
die "either type or address parameter is required";
}
-
+
my $self = $class->SUPER::new(%params, connection => $connection);
bless $self, $class;
@@ -99,7 +99,7 @@ sub new {
=item $bus->request_name($service_name)
-Send a request to the bus registering the well known name
+Send a request to the bus registering the well known name
specified in the C<$service_name> parameter. If another client
already owns the name, registration will be queued up, pending
the exit of the other client.
@@ -109,7 +109,7 @@ the exit of the other client.
sub request_name {
my $self = shift;
my $service_name = shift;
-
+
$self->{connection}->dbus_bus_request_name($service_name);
}
@@ -138,7 +138,7 @@ matching broadcast signals to routed to this client.
sub add_match {
my $self = shift;
my $rule = shift;
-
+
$self->{connection}->dbus_bus_add_match($rule);
}
@@ -152,7 +152,7 @@ further broadcast signals being routed to this client
sub remove_match {
my $self = shift;
my $rule = shift;
-
+
$self->{connection}->dbus_bus_remove_match($rule);
}
diff --git a/lib/Net/DBus/Binding/Connection.pm b/lib/Net/DBus/Binding/Connection.pm
index b80fd1d..b802a6a 100644
--- a/lib/Net/DBus/Binding/Connection.pm
+++ b/lib/Net/DBus/Binding/Connection.pm
@@ -122,7 +122,7 @@ otherwise a positive value is returned.
sub is_connected {
my $self = shift;
-
+
return $self->{connection}->dbus_connection_get_is_connected();
}
@@ -136,7 +136,7 @@ returned.
sub is_authenticated {
my $self = shift;
-
+
return $self->{connection}->dbus_connection_get_is_authenticated();
}
@@ -152,7 +152,7 @@ explicitly disconnect.
sub disconnect {
my $self = shift;
-
+
$self->{connection}->dbus_connection_disconnect();
}
@@ -166,7 +166,7 @@ the application event loop.
sub flush {
my $self = shift;
-
+
$self->{connection}->dbus_connection_flush();
}
@@ -175,7 +175,7 @@ sub flush {
Queues a message up for sending to the remote host.
The data will be sent asynchronously as the applications
-event loop determines there is space in the outgoing
+event loop determines there is space in the outgoing
socket send buffer. To force immediate sending of the
data, follow this method will a call to C<flush>. This
method will return the serial number of the message,
@@ -253,7 +253,7 @@ loop where data has been read from the incoming socket.
sub dispatch {
my $self = shift;
-
+
$self->{connection}->_dispatch();
}
@@ -263,7 +263,7 @@ sub dispatch {
Temporarily removes the first message from the incoming
message queue. No other thread may access the message
while it is 'borrowed', so it should be replaced in the
-queue with the C<return_message> method, or removed
+queue with the C<return_message> method, or removed
permanently with th C<steal_message> method as soon as
is practical.
@@ -271,7 +271,7 @@ is practical.
sub borrow_message {
my $self = shift;
-
+
my $msg = $self->{connection}->dbus_connection_borrow_message();
return $self->make_raw_message($msg);
}
@@ -279,7 +279,7 @@ sub borrow_message {
=item $con->return_message($msg)
Replaces a previously borrowed message in the incoming
-message queue for subsequent dispatch to registered
+message queue for subsequent dispatch to registered
message handlers.
=cut
@@ -287,7 +287,7 @@ message handlers.
sub return_message {
my $self = shift;
my $msg = shift;
-
+
$self->{connection}->dbus_connection_return_message($msg->{message});
}
@@ -303,7 +303,7 @@ be run for this message.
sub steal_message {
my $self = shift;
my $msg = shift;
-
+
$self->{connection}->dbus_connection_steal_borrowed_message($msg->{message});
}
@@ -319,14 +319,14 @@ don't want to be calling this method.
sub pop_message {
my $self = shift;
-
+
my $msg = $self->{connection}->dbus_connection_pop_message();
return $self->make_raw_message($msg);
}
=item $con->set_watch_callbacks(\&add_watch, \&remove_watch, \&toggle_watch);
-Register a set of callbacks for adding, removing & updating
+Register a set of callbacks for adding, removing & updating
watches in the application's event loop. Each parameter
should be a code reference, which on each invocation, will be
supplied with two parameters, the connection object and the
@@ -351,7 +351,7 @@ sub set_watch_callbacks {
=item $con->set_timeout_callbacks(\&add_timeout, \&remove_timeout, \&toggle_timeout);
-Register a set of callbacks for adding, removing & updating
+Register a set of callbacks for adding, removing & updating
timeouts in the application's event loop. Each parameter
should be a code reference, which on each invocation, will be
supplied with two parameters, the connection object and the
@@ -416,7 +416,7 @@ sub unregister_object_path {
=item $con->register_fallback($path, \&handler)
-Registers a handler for messages whose path starts with
+Registers a handler for messages whose path starts with
the prefix specified in the C<$path> parameter. The supplied
code reference will be invoked with two parameters, the
connection object on which the message was received,
@@ -453,7 +453,7 @@ is specified in bytes.
sub set_max_message_size {
my $self = shift;
my $size = shift;
-
+
$self->{connection}->dbus_connection_set_max_message_size($size);
}
@@ -467,7 +467,7 @@ in bytes.
sub get_max_message_size {
my $self = shift;
-
+
return $self->{connection}->dbus_connection_get_max_message_size;
}
@@ -485,7 +485,7 @@ this threshold by at most the size of a single message.
sub set_max_received_size {
my $self = shift;
my $size = shift;
-
+
$self->{connection}->dbus_connection_set_max_received_size($size);
}
@@ -498,7 +498,7 @@ The returned size is measured in bytes.
sub get_max_received_size {
my $self = shift;
-
+
return $self->{connection}->dbus_connection_get_max_received_size;
}
@@ -516,7 +516,7 @@ should be performed.
sub add_filter {
my $self = shift;
my $callback = shift;
-
+
$self->{connection}->_add_filter($callback);
}
@@ -525,7 +525,7 @@ sub _message_filter {
my $self = shift;
my $rawmsg = shift;
my $code = shift;
-
+
my $msg = $self->make_raw_message($rawmsg);
return &$code($self, $msg);
}
@@ -542,7 +542,7 @@ will be cast to the appropriate subclass of L<Net::DBus::Binding::Message>.
sub make_raw_message {
my $self = shift;
my $rawmsg = shift;
-
+
return Net::DBus::Binding::Message->new(message => $rawmsg);
}
diff --git a/lib/Net/DBus/Binding/Iterator.pm b/lib/Net/DBus/Binding/Iterator.pm
index 0e9c8a3..8defcf4 100644
--- a/lib/Net/DBus/Binding/Iterator.pm
+++ b/lib/Net/DBus/Binding/Iterator.pm
@@ -116,7 +116,7 @@ a valid object path, from/to the message iterator
=item $iter->append_signature($val);
-Read or write a UTF-8 string, whose contents is a
+Read or write a UTF-8 string, whose contents is a
valid type signature, value from/to the message iterator
=item my $val = $iter->get_int16()
@@ -167,7 +167,7 @@ build of Perl does not support 64 bit integers
=item $iter->append_double($val);
-Read or write a double precision floating point value
+Read or write a double precision floating point value
from/to the message iterator
=cut
@@ -205,7 +205,7 @@ constants.
=cut
sub get {
- my $self = shift;
+ my $self = shift;
my $type = shift;
if (defined $type) {
@@ -285,13 +285,13 @@ sub get {
=item my $hashref = $iter->get_dict()
If the iterator currently points to a dictionary value, unmarshalls
-and returns the value as a hash reference.
+and returns the value as a hash reference.
=cut
sub get_dict {
my $self = shift;
-
+
my $iter = $self->_recurse();
my $type = $iter->get_arg_type();
my $dict = {};
@@ -311,14 +311,14 @@ sub get_dict {
=item my $hashref = $iter->get_array()
If the iterator currently points to an array value, unmarshalls
-and returns the value as a array reference.
+and returns the value as a array reference.
=cut
sub get_array {
my $self = shift;
my $array_type = shift;
-
+
my $iter = $self->_recurse();
my $type = $iter->get_arg_type();
my $array = [];
@@ -353,14 +353,14 @@ sub get_variant {
=item my $hashref = $iter->get_struct()
If the iterator currently points to an struct value, unmarshalls
-and returns the value as a array reference. The values in the array
+and returns the value as a array reference. The values in the array
correspond to members of the struct.
=cut
sub get_struct {
my $self = shift;
-
+
my $iter = $self->_recurse();
my $type = $iter->get_arg_type();
my $struct = [];
@@ -462,7 +462,7 @@ sub append {
=item my $type = $iter->guess_type($value)
-Make a best guess at the on the wire data type to use for
+Make a best guess at the on the wire data type to use for
marshalling C<$value>. If the value is a hash reference,
the dictionary type is returned; if the value is an array
reference the array type is returned; otherwise the string
@@ -483,7 +483,7 @@ sub guess_type {
if (!defined $subtype) {
if ($maintype == &Net::DBus::Binding::Message::TYPE_DICT_ENTRY) {
- $subtype = [ $self->guess_type(($value->value())[0]->[0]),
+ $subtype = [ $self->guess_type(($value->value())[0]->[0]),
$self->guess_type(($value->value())[0]->[1]) ];
} elsif ($maintype == &Net::DBus::Binding::Message::TYPE_ARRAY) {
$subtype = [ $self->guess_type(($value->value())[0]->[0]) ];
@@ -519,7 +519,7 @@ sub guess_type {
=item my $sig = $iter->format_signature($type)
-Given a data type representation, construct a corresponding
+Given a data type representation, construct a corresponding
signature string
=cut
@@ -535,7 +535,7 @@ sub format_signature {
if (ref($type) eq "ARRAY") {
while ($i <= $#{$type}) {
$t = $$type[$i];
-
+
if (ref($t) eq "ARRAY") {
$sig .= $self->format_signature($t);
} elsif ($t == &Net::DBus::Binding::Message::TYPE_DICT_ENTRY) {
@@ -546,13 +546,13 @@ sub format_signature {
} else {
$sig .= chr($t);
}
-
+
$i++;
}
} else {
$sig .= chr ($type);
}
-
+
return $sig;
}
@@ -568,7 +568,7 @@ sub append_array {
my $self = shift;
my $array = shift;
my $type = shift;
-
+
if (!defined($type)) {
$type = [$self->guess_type($array->[0])];
}
@@ -578,7 +578,7 @@ sub append_array {
my $sig = $self->format_signature($type);
my $iter = $self->_open_container(&Net::DBus::Binding::Message::TYPE_ARRAY, $sig);
-
+
foreach my $value (@{$array}) {
$iter->append($value, $type->[0]);
}
@@ -607,7 +607,7 @@ sub append_struct {
}
my $iter = $self->_open_container(&Net::DBus::Binding::Message::TYPE_STRUCT, "");
-
+
my @type = defined $type ? @{$type} : ();
foreach my $value (@{$struct}) {
$iter->append($value, shift @type);
@@ -636,7 +636,7 @@ sub append_dict {
$sig .= "}";
my $iter = $self->_open_container(&Net::DBus::Binding::Message::TYPE_ARRAY, $sig);
-
+
foreach my $key (keys %{$hash}) {
my $value = $hash->{$key};
my $entry = $iter->_open_container(&Net::DBus::Binding::Message::TYPE_DICT_ENTRY, "");
@@ -686,8 +686,8 @@ C<Net::DBus::Binding::Message::TYPE_*>
=item my $type = $iter->get_element_type
-If the iterator points to an array, retrieves the type code of
-array elements. The returned code will correspond to one of the
+If the iterator points to an array, retrieves the type code of
+array elements. The returned code will correspond to one of the
constants C<Net::DBus::Binding::Message::TYPE_*>
=cut
diff --git a/lib/Net/DBus/Binding/Message.pm b/lib/Net/DBus/Binding/Message.pm
index 401c342..4d36cfd 100644
--- a/lib/Net/DBus/Binding/Message.pm
+++ b/lib/Net/DBus/Binding/Message.pm
@@ -166,11 +166,11 @@ sub new {
my %params = @_;
my $self = {};
- $self->{message} = exists $params{message} ? $params{message} :
+ $self->{message} = exists $params{message} ? $params{message} :
(Net::DBus::Binding::Message::_create(exists $params{type} ? $params{type} : die "type parameter is required"));
bless $self, $class;
-
+
if ($class eq "Net::DBus::Binding::Message") {
$self->_specialize;
}
@@ -180,7 +180,7 @@ sub new {
sub _specialize {
my $self = shift;
-
+
my $type = $self->get_type;
if ($type == &Net::DBus::Binding::Message::MESSAGE_TYPE_METHOD_CALL) {
bless $self, "Net::DBus::Binding::Message::MethodCall";
@@ -217,7 +217,7 @@ an empty string if there is no applicable interface for this message.
sub get_interface {
my $self = shift;
-
+
return $self->{message}->dbus_message_get_interface;
}
@@ -230,7 +230,7 @@ empty string if there is no applicable object for this message.
sub get_path {
my $self = shift;
-
+
return $self->{message}->dbus_message_get_path;
}
@@ -244,7 +244,7 @@ the message is being broadcast to all clients.
sub get_destination {
my $self = shift;
-
+
return $self->{message}->dbus_message_get_destination;
}
@@ -256,7 +256,7 @@ Retireves the unique name of the client sending the message
sub get_sender {
my $self = shift;
-
+
return $self->{message}->dbus_message_get_sender;
}
@@ -271,7 +271,7 @@ is yet to be sent.
sub get_serial {
my $self = shift;
-
+
return $self->{message}->dbus_message_get_serial;
}
@@ -284,7 +284,7 @@ while for signals, retrieves the name of the signal.
sub get_member {
my $self = shift;
-
+
return $self->{message}->dbus_message_get_member;
}
@@ -297,7 +297,7 @@ packed into the body of the message.
sub get_signature {
my $self = shift;
-
+
return $self->{message}->dbus_message_get_signature;
}
@@ -337,7 +337,7 @@ an instance of the C<Net::DBus::Binding::Iterator> class.
sub iterator {
my $self = shift;
my $append = @_ ? shift : 0;
-
+
if ($append) {
return Net::DBus::Binding::Message::_iterator_append($self->{message});
} else {
@@ -348,13 +348,13 @@ sub iterator {
=item $boolean = $msg->get_no_reply()
Gets the flag indicating whether the message is expecting
-a reply to be sent.
+a reply to be sent.
=cut
sub get_no_reply {
my $self = shift;
-
+
return $self->{message}->dbus_message_get_no_reply;
}
@@ -371,13 +371,13 @@ is reduced by removing the need for the client to wait
sub set_no_reply {
my $self = shift;
my $flag = shift;
-
+
$self->{message}->dbus_message_set_no_reply($flag);
}
=item my @values = $msg->get_args_list
-De-marshall all the values in the body of the message, using the
+De-marshall all the values in the body of the message, using the
message signature to identify data types. The values are returned
as a list.
@@ -385,8 +385,8 @@ as a list.
sub get_args_list {
my $self = shift;
-
- my @ret;
+
+ my @ret;
my $iter = $self->iterator;
if ($iter->get_arg_type() != &Net::DBus::Binding::Message::TYPE_INVALID) {
do {
@@ -409,7 +409,7 @@ the L<Net::DBus::Binding::Iterator> object should be used instead.
sub append_args_list {
my $self = shift;
my @args = @_;
-
+
my $iter = $self->iterator(1);
foreach my $arg (@args) {
$iter->append($arg);
diff --git a/lib/Net/DBus/Binding/Message/Error.pm b/lib/Net/DBus/Binding/Message/Error.pm
index 44d9459..4eaf054 100644
--- a/lib/Net/DBus/Binding/Message/Error.pm
+++ b/lib/Net/DBus/Binding/Message/Error.pm
@@ -41,7 +41,7 @@ about APIs under the C<Net::DBus::Binding::> namespace being
stable across releases.
This module provides a convenience constructor for creating
-a message representing an error condition.
+a message representing an error condition.
=head1 METHODS
@@ -76,7 +76,7 @@ sub new {
my $replyto = exists $params{replyto} ? $params{replyto} : die "replyto parameter is required";
- my $msg = exists $params{message} ? $params{message} :
+ my $msg = exists $params{message} ? $params{message} :
Net::DBus::Binding::Message::Error::_create
(
$replyto->{message},
@@ -86,7 +86,7 @@ sub new {
my $self = $class->SUPER::new(message => $msg);
bless $self, $class;
-
+
return $self;
}
@@ -99,7 +99,7 @@ the C<name> parameter in the constructor.
sub get_error_name {
my $self = shift;
-
+
return $self->{message}->dbus_message_get_error_name;
}
diff --git a/lib/Net/DBus/Binding/Message/MethodCall.pm b/lib/Net/DBus/Binding/Message/MethodCall.pm
index 32ba1de..92b2852 100644
--- a/lib/Net/DBus/Binding/Message/MethodCall.pm
+++ b/lib/Net/DBus/Binding/Message/MethodCall.pm
@@ -30,7 +30,7 @@ about APIs under the C<Net::DBus::Binding::> namespace being
stable across releases.
This module provides a convenience constructor for creating
-a message representing a method call.
+a message representing a method call.
=head1 METHODS
@@ -49,7 +49,7 @@ use Net::DBus;
use base qw(Exporter Net::DBus::Binding::Message);
=item my $call = Net::DBus::Binding::Message::MethodCall->new(
- service_name => $service, object_path => $object,
+ service_name => $service, object_path => $object,
interface => $interface, method_name => $name);
Create a message representing a call on the object located at
@@ -76,7 +76,7 @@ sub new {
my $self = $class->SUPER::new(message => $msg);
bless $self, $class;
-
+
return $self;
}
diff --git a/lib/Net/DBus/Binding/Message/MethodReturn.pm b/lib/Net/DBus/Binding/Message/MethodReturn.pm
index 3e25fee..888c2eb 100644
--- a/lib/Net/DBus/Binding/Message/MethodReturn.pm
+++ b/lib/Net/DBus/Binding/Message/MethodReturn.pm
@@ -61,14 +61,14 @@ sub new {
my %params = @_;
my $call = exists $params{call} ? $params{call} : die "call parameter is required";
-
- my $msg = exists $params{message} ? $params{message} :
+
+ my $msg = exists $params{message} ? $params{message} :
Net::DBus::Binding::Message::MethodReturn::_create($call->{message});
my $self = $class->SUPER::new(message => $msg);
bless $self, $class;
-
+
return $self;
}
diff --git a/lib/Net/DBus/Binding/Message/Signal.pm b/lib/Net/DBus/Binding/Message/Signal.pm
index e2bc5e6..6011454 100644
--- a/lib/Net/DBus/Binding/Message/Signal.pm
+++ b/lib/Net/DBus/Binding/Message/Signal.pm
@@ -41,7 +41,7 @@ about APIs under the C<Net::DBus::Binding::> namespace being
stable across releases.
This module provides a convenience constructor for creating
-a message representing a signal.
+a message representing a signal.
=head1 METHODS
@@ -62,7 +62,7 @@ use base qw(Net::DBus::Binding::Message);
=item my $signal = Net::DBus::Binding::Message::Signal->new(
object_path => $path, interface => $interface, signal_name => $name);
-Creates a new message, representing a signal [to be] emitted by
+Creates a new message, representing a signal [to be] emitted by
the object located under the path given by the C<object_path>
parameter. The name of the signal is given by the C<signal_name>
parameter, and is scoped to the interface given by the
@@ -85,7 +85,7 @@ sub new {
my $self = $class->SUPER::new(message => $msg);
bless $self, $class;
-
+
return $self;
}
diff --git a/lib/Net/DBus/Binding/Server.pm b/lib/Net/DBus/Binding/Server.pm
index d68fef5..3557a45 100644
--- a/lib/Net/DBus/Binding/Server.pm
+++ b/lib/Net/DBus/Binding/Server.pm
@@ -62,7 +62,7 @@ may be of use.
=head1 METHODS
-=over
+=over
=cut
@@ -118,7 +118,7 @@ otherwise a positive value is returned.
sub is_connected {
my $self = shift;
-
+
return $self->{server}->dbus_server_get_is_connected();
}
@@ -133,14 +133,14 @@ explicitly disconnect.
sub disconnect {
my $self = shift;
-
+
return $self->{server}->dbus_server_disconnect();
}
=item $server->set_watch_callbacks(\&add_watch, \&remove_watch, \&toggle_watch);
-Register a set of callbacks for adding, removing & updating
+Register a set of callbacks for adding, removing & updating
watches in the application's event loop. Each parameter
should be a code reference, which on each invocation, will be
supplied with two parameters, the server object and the
@@ -166,7 +166,7 @@ sub set_watch_callbacks {
=item $server->set_timeout_callbacks(\&add_timeout, \&remove_timeout, \&toggle_timeout);
-Register a set of callbacks for adding, removing & updating
+Register a set of callbacks for adding, removing & updating
timeouts in the application's event loop. Each parameter
should be a code reference, which on each invocation, will be
supplied with two parameters, the server object and the
diff --git a/lib/Net/DBus/Binding/Value.pm b/lib/Net/DBus/Binding/Value.pm
index 93ff75b..447320f 100644
--- a/lib/Net/DBus/Binding/Value.pm
+++ b/lib/Net/DBus/Binding/Value.pm
@@ -62,10 +62,10 @@ should be used.
sub new {
my $class = shift;
my $self = [];
-
+
$self->[0] = shift;
$self->[1] = shift;
-
+
bless $self, $class;
return $self;
diff --git a/lib/Net/DBus/Callback.pm b/lib/Net/DBus/Callback.pm
index 6f20e67..17007b2 100644
--- a/lib/Net/DBus/Callback.pm
+++ b/lib/Net/DBus/Callback.pm
@@ -75,8 +75,8 @@ to be pass to the callback, in addition to those passed into the C<invoke> metho
Creates a new callback object, for invoking a method on an object. The C<method>
parameter should be the name of the method to invoke, while the C<object> parameter
-should be a blessed object on which the method will be invoked. The optional C<args>
-parameter is an array reference of parameters to be pass to the callback, in addition
+should be a blessed object on which the method will be invoked. The optional C<args>
+parameter is an array reference of parameters to be pass to the callback, in addition
to those passed into the C<invoke> method.
=cut
@@ -107,7 +107,7 @@ method.
sub invoke {
my $self = shift;
-
+
if ($self->{object}) {
my $obj = $self->{object};
my $method = $self->{method};
diff --git a/lib/Net/DBus/Dumper.pm b/lib/Net/DBus/Dumper.pm
index 948e07b..6449162 100644
--- a/lib/Net/DBus/Dumper.pm
+++ b/lib/Net/DBus/Dumper.pm
@@ -43,7 +43,7 @@ Net::DBus::Dumper - Stringify Net::DBus objects suitable for printing
=head1 DESCRIPTION
This module serves as a debugging aid, providing a means to stringify
-a DBus related object in a form suitable for printing out. It can
+a DBus related object in a form suitable for printing out. It can
stringify any of the Net::DBus:* objects, generating the following
information for each
@@ -87,7 +87,7 @@ use vars qw(@EXPORT);
=item my @data = dbus_dump($object);
Generates a stringified representation of an object. The object
-passed in as the parameter must be an instance of one of L<Net::DBus>,
+passed in as the parameter must be an instance of one of L<Net::DBus>,
L<Net::DBus::RemoteService>, L<Net::DBus::Service>,
L<Net::DBus::RemoteObject>, L<Net::DBus::Object>. The stringified
representation will be returned as a list of strings, with newlines
@@ -98,10 +98,10 @@ method.
sub dbus_dump {
my $object = shift;
-
+
my $ref = ref($object);
die "object '$object' is not a reference" unless defined $ref;
-
+
if ($object->isa("Net::DBus::Object") ||
$object->isa("Net::DBus::RemoteObject")) {
return &_dbus_dump_introspector($object->_introspector);
@@ -116,7 +116,7 @@ sub dbus_dump {
sub _dbus_dump_introspector {
my $ins = shift;
-
+
my @data;
push @data, "Object: ", $ins->get_object_path, "\n";
foreach my $interface (sort { $a cmp $b } $ins->list_interfaces) {
@@ -153,7 +153,7 @@ sub _dbus_dump_types {
my $indent = shift;
my $type = shift;
my $name = shift;
-
+
my @data;
push @data, $indent;
if (ref($type)) {
@@ -178,10 +178,10 @@ sub _dbus_dump_types {
sub _dbus_dump_service {
my $service = shift;
-
+
my @data;
push @data, "Service: ", $service->get_service_name, "\n";
-
+
my @objects = &_dbus_dump_children($service, "/");
foreach (@objects) {
push @data, " Object: $_\n";
@@ -213,15 +213,15 @@ sub _dbus_dump_children {
sub _dbus_dump_bus {
my $bus = shift;
-
+
my @data;
push @data, "Bus: \n";
-
-
+
+
my $dbus = $bus->get_service("org.freedesktop.DBus");
my $obj = $dbus->get_object("/org/freedesktop/DBus");
my $names = $obj->ListNames();
-
+
foreach (sort { $a cmp $b } @{$names}) {
push @data, " Service: ", $_, "\n";
}
@@ -250,7 +250,7 @@ Copyright (C) 2005-2009 Daniel P. Berrange
=head1 SEE ALSO
-L<Net::DBus>, L<Net::DBus::RemoteService>, L<Net::DBus::Service>,
+L<Net::DBus>, L<Net::DBus::RemoteService>, L<Net::DBus::Service>,
L<Net::DBus::RemoteObject>, L<Net::DBus::Object>, L<Data::Dumper>.
=cut
diff --git a/lib/Net/DBus/Error.pm b/lib/Net/DBus/Error.pm
index 2aae188..e82e516 100644
--- a/lib/Net/DBus/Error.pm
+++ b/lib/Net/DBus/Error.pm
@@ -89,7 +89,7 @@ use overload ('""' => 'stringify');
message => $description);
Creates a new error object whose name is given by the C<name>
-parameter, and long descriptive text is provided by the
+parameter, and long descriptive text is provided by the
C<message> parameter. The C<name> parameter has certain
formatting rules which must be adhered to. It must only contain
the letters 'a'-'Z', '0'-'9', '-', '_' and '.'. There must be
diff --git a/lib/Net/DBus/Exporter.pm b/lib/Net/DBus/Exporter.pm
index 8eab83f..c046046 100644
--- a/lib/Net/DBus/Exporter.pm
+++ b/lib/Net/DBus/Exporter.pm
@@ -121,7 +121,7 @@ An IEEE double-precision floating point
When specifying compound data types for parameters and return
values, an array reference must be used, with the first element
-being the name of the compound type.
+being the name of the compound type.
=over 4
@@ -129,7 +129,7 @@ being the name of the compound type.
An array of values, whose type os C<ARRAY-TYPE>. The C<ARRAY-TYPE>
can be either a scalar type name, or a nested compound type. When
-values corresponding to the array type are (un)marshalled, they
+values corresponding to the array type are (un)marshalled, they
are represented as the Perl ARRAY data type (see L<perldata>). If,
for example, a method was declared to have a single parameter with
the type, ["array", "string"], then when calling the method one
@@ -146,7 +146,7 @@ data type used for the dictionary values. When values corresponding
to the dict type are (un)marshalled, they are represented as the
Perl HASH data type (see L<perldata>). If, for example, a method was
declared to have a single parameter with the type ["dict", "string", "string"],
-then when calling the method one would provide a hash reference
+then when calling the method one would provide a hash reference
of strings,
$object->hello({forename => "John", surname => "Doe"});
@@ -159,7 +159,7 @@ name associated with each value, but since Perl does not have a
native representation of structures, they are represented by the
LIST data type. If, for exaple, a method was declared to have a single
parameter with the type ["struct", "string", "string"], corresponding
-to the C structure
+to the C structure
struct {
char *forename;
@@ -179,7 +179,7 @@ When specifying introspection data for an exported service, there
are a couple of so called C<magic> types. Parameters declared as
magic types are not visible to clients, but instead their values
are provided automatically by the server side bindings. One use of
-magic types is to get an extra parameter passed with the unique
+magic types is to get an extra parameter passed with the unique
name of the caller invoking the method.
=over 4
@@ -192,8 +192,8 @@ by the bus daemon, for example ':1.15'
=item "serial"
-The value passed in is an integer within the scope of a caller, which
-increments on every method call.
+The value passed in is an integer within the scope of a caller, which
+increments on every method call.
=back
@@ -306,7 +306,7 @@ sub _dbus_introspector {
&_dbus_introspector_add($class, $is);
$dbus_introspectors{$class} = $is;
}
-
+
return $dbus_introspectors{$class};
}
@@ -329,7 +329,7 @@ sub _dbus_introspector_add {
$introspector->add_signal($signal, $params, $interface, $attributes, $paramnames);
}
}
-
+
if (defined (*{"${class}::ISA"})) {
no strict "refs";
my @isa = @{"${class}::ISA"};
@@ -345,12 +345,12 @@ sub _dbus_introspector_add {
Exports a method called C<$name>, having parameters whose types
are defined by C<$params>, and returning values whose types are
-defined by C<$returns>. If the C<$interface> parameter is
+defined by C<$returns>. If the C<$interface> parameter is
provided, then the method is associated with that interface, otherwise
the default interface for the calling package is used. The
value for the C<$params> parameter should be an array reference
with each element defining the data type of a parameter to the
-method. Likewise, the C<$returns> parameter should be an array
+method. Likewise, the C<$returns> parameter should be an array
reference with each element defining the data type of a return
value. If it not possible to export a method which accepts a
variable number of parameters, or returns a variable number of
@@ -365,7 +365,7 @@ sub dbus_method {
my $caller = caller;
my $interface = $dbus_exports{$caller}->{interface};
my %attributes;
-
+
if (@_ && ref($_[0]) eq "ARRAY") {
$params = shift;
}
@@ -404,9 +404,9 @@ sub dbus_method {
=item dbus_property($name, $type, $access, $interface, [\%attributes]);
Exports a property called C<$name>, whose data type is C<$type>.
-If the C<$interface> parameter is provided, then the property is
-associated with that interface, otherwise the default interface
-for the calling package is used.
+If the C<$interface> parameter is provided, then the property is
+associated with that interface, otherwise the default interface
+for the calling package is used.
=cut
@@ -417,7 +417,7 @@ sub dbus_property {
my $caller = caller;
my $interface = $dbus_exports{$caller}->{interface};
my %attributes;
-
+
if (@_ && (!ref($_[0]) || (ref($_[0]) eq "ARRAY"))) {
$type = shift;
}
@@ -445,12 +445,12 @@ sub dbus_property {
=item dbus_signal($name, $params, $interface, [\%attributes]);
Exports a signal called C<$name>, having parameters whose types
-are defined by C<$params>. If the C<$interface> parameter is
+are defined by C<$params>. If the C<$interface> parameter is
provided, then the signal is associated with that interface, otherwise
the default interface for the calling package is used. The
value for the C<$params> parameter should be an array reference
with each element defining the data type of a parameter to the
-signal. Signals do not have return values. It not possible to
+signal. Signals do not have return values. It not possible to
export a signal which has a variable number of parameters.
=cut
@@ -461,7 +461,7 @@ sub dbus_signal {
my $caller = caller;
my $interface = $dbus_exports{$caller}->{interface};
my %attributes;
-
+
if (@_ && ref($_[0]) eq "ARRAY") {
$params = shift;
}
diff --git a/lib/Net/DBus/Reactor.pm b/lib/Net/DBus/Reactor.pm
index 7a09c7f..3746739 100644
--- a/lib/Net/DBus/Reactor.pm
+++ b/lib/Net/DBus/Reactor.pm
@@ -123,7 +123,7 @@ use Time::HiRes qw(gettimeofday);
=item my $reactor = Net::DBus::Reactor->new();
-Creates a new event loop ready for monitoring file handles, or
+Creates a new event loop ready for monitoring file handles, or
generating timeouts. Except in very unsual circumstances (examples
of which I can't think up) it is not neccessary or desriable to
explicitly create new reactor instances. Instead call the L<main>
@@ -202,12 +202,12 @@ sub manage {
$self->_manage_watch_toggle($object, $watch);
});
}
-
+
if ($object->can("set_timeout_callbacks")) {
$object->set_timeout_callbacks(sub {
my $object = shift;
my $timeout = shift;
-
+
my $key = $self->add_timeout($timeout->get_interval,
Net::DBus::Callback->new(object => $timeout,
method => "handle",
@@ -217,30 +217,30 @@ sub manage {
}, sub {
my $object = shift;
my $timeout = shift;
-
+
my $key = $timeout->get_data;
$self->remove_timeout($key);
}, sub {
my $object = shift;
my $timeout = shift;
-
+
my $key = $timeout->get_data;
$self->remove_timeout($key,
$timeout->is_enabled,
$timeout->get_interval);
});
}
-
+
if ($object->can("dispatch")) {
- $self->add_hook(Net::DBus::Callback->new(object => $object,
- method => "dispatch",
- args => []),
+ $self->add_hook(Net::DBus::Callback->new(object => $object,
+ method => "dispatch",
+ args => []),
1);
}
if ($object->can("flush")) {
- $self->add_hook(Net::DBus::Callback->new(object => $object,
- method => "flush",
- args => []),
+ $self->add_hook(Net::DBus::Callback->new(object => $object,
+ method => "flush",
+ args => []),
1);
}
}
@@ -253,25 +253,25 @@ sub _manage_watch_on {
my $flags = $watch->get_flags;
if ($flags & &Net::DBus::Binding::Watch::READABLE) {
- $self->add_read($watch->get_fileno,
- Net::DBus::Callback->new(object => $watch,
- method => "handle",
- args => [&Net::DBus::Binding::Watch::READABLE]),
+ $self->add_read($watch->get_fileno,
+ Net::DBus::Callback->new(object => $watch,
+ method => "handle",
+ args => [&Net::DBus::Binding::Watch::READABLE]),
$watch->is_enabled);
}
if ($flags & &Net::DBus::Binding::Watch::WRITABLE) {
- $self->add_write($watch->get_fileno,
- Net::DBus::Callback->new(object => $watch,
- method => "handle",
- args => [&Net::DBus::Binding::Watch::WRITABLE]),
+ $self->add_write($watch->get_fileno,
+ Net::DBus::Callback->new(object => $watch,
+ method => "handle",
+ args => [&Net::DBus::Binding::Watch::WRITABLE]),
$watch->is_enabled);
}
-# $self->add_exception($watch->get_fileno, $watch,
-# Net::DBus::Callback->new(object => $watch,
-# method => "handle",
-# args => [&Net::DBus::Binding::Watch::ERROR]),
+# $self->add_exception($watch->get_fileno, $watch,
+# Net::DBus::Callback->new(object => $watch,
+# method => "handle",
+# args => [&Net::DBus::Binding::Watch::ERROR]),
# $watch->is_enabled);
-
+
}
sub _manage_watch_off {
@@ -279,7 +279,7 @@ sub _manage_watch_off {
my $object = shift;
my $watch = shift;
my $flags = $watch->get_flags;
-
+
if ($flags & &Net::DBus::Binding::Watch::READABLE) {
$self->remove_read($watch->get_fileno);
}
@@ -294,7 +294,7 @@ sub _manage_watch_toggle {
my $object = shift;
my $watch = shift;
my $flags = $watch->get_flags;
-
+
if ($flags & &Net::DBus::Binding::Watch::READABLE) {
$self->toggle_read($watch->get_fileno, $watch->is_enabled);
}
@@ -348,9 +348,9 @@ not required in day-to-day use.
sub step {
my $self = shift;
-
+
my @callbacks = $self->_dispatch_hook();
-
+
foreach my $callback (@callbacks) {
$callback->invoke;
}
@@ -359,7 +359,7 @@ sub step {
my ($wi, $wic) = $self->_bits("write");
my ($ei, $eic) = $self->_bits("exception");
my $timeout = $self->_timeout($self->_now);
-
+
if (!$ric && !$wic && !$eic && !(defined $timeout)) {
$self->{running} = 0;
}
@@ -371,7 +371,7 @@ sub step {
my ($ro, $wo, $eo);
my $n = select($ro=$ri,$wo=$wi,$eo=$ei, (defined $timeout ? ($timeout ? $timeout/1000 : 0) : undef));
-
+
@callbacks = ();
if ($n) {
push @callbacks, $self->_dispatch_fd("read", $ro);
@@ -380,7 +380,7 @@ sub step {
}
push @callbacks, $self->_dispatch_timeout($self->_now);
#push @callbacks, $self->_dispatch_hook();
-
+
foreach my $callback (@callbacks) {
$callback->invoke;
}
@@ -390,9 +390,9 @@ sub step {
sub _now {
my $self = shift;
-
+
my @now = gettimeofday;
-
+
return $now[0] * 1000 + (($now[1] - ($now[1] % 1000)) / 1000);
}
@@ -414,7 +414,7 @@ sub _bits {
sub _timeout {
my $self = shift;
my $now = shift;
-
+
my $timeout;
foreach (@{$self->{timeouts}}) {
next unless $_->{enabled};
@@ -432,14 +432,14 @@ sub _dispatch_fd {
my $self = shift;
my $type = shift;
my $vec = shift;
-
+
my @callbacks;
foreach my $fd (keys %{$self->{fds}->{$type}}) {
next unless $self->{fds}->{$type}->{$fd}->{enabled};
if (vec($vec, $fd, 1)) {
my $rec = $self->{fds}->{$type}->{$fd};
-
+
push @callbacks, $self->{fds}->{$type}->{$fd}->{callback};
}
}
@@ -450,13 +450,13 @@ sub _dispatch_fd {
sub _dispatch_timeout {
my $self = shift;
my $now = shift;
-
+
my @callbacks;
foreach my $timeout (@{$self->{timeouts}}) {
next unless $timeout->{enabled};
my $expired = $now - $timeout->{last_fired};
- # Select typically returns a little (0-10 ms) before we
+ # Select typically returns a little (0-10 ms) before we
# asked it for. (8 milliseconds seems reasonable balance
# between early timeouts & extra select calls
if ($expired >= ($timeout->{interval}-8)) {
@@ -552,7 +552,7 @@ sub add_timeout {
my $self = shift;
my $interval = shift;
my $callback = shift;
- my $enabled = shift;
+ my $enabled = shift;
$enabled = 1 unless defined $enabled;
if (ref($callback) eq "CODE") {
@@ -564,7 +564,7 @@ sub add_timeout {
$key = $i unless defined $self->{timeouts}->[$i];
}
$key = $#{$self->{timeouts}}+1 unless defined $key;
-
+
$self->{timeouts}->[$key] = {
interval => $interval,
last_fired => $self->_now,
@@ -586,8 +586,8 @@ the C<$id> parameter.
sub remove_timeout {
my $self = shift;
my $key = shift;
-
- die "no timeout active with key '$key'"
+
+ die "no timeout active with key '$key'"
unless defined $self->{timeouts}->[$key];
$self->{timeouts}->[$key] = undef;
@@ -608,7 +608,7 @@ sub toggle_timeout {
my $self = shift;
my $key = shift;
my $enabled = shift;
-
+
$self->{timeouts}->[$key]->{enabled} = $enabled;
$self->{timeouts}->[$key]->{interval} = shift if @_;
}
@@ -630,9 +630,9 @@ be used to later remove, or disable the hook.
sub add_hook {
my $self = shift;
my $callback = shift;
- my $enabled = shift;
+ my $enabled = shift;
$enabled = 1 unless defined $enabled;
-
+
if (ref($callback) eq "CODE") {
$callback = Net::DBus::Callback->new(method => $callback);
}
@@ -662,8 +662,8 @@ by C<$id>.
sub remove_hook {
my $self = shift;
my $key = shift;
-
- die "no hook present with key '$key'"
+
+ die "no hook present with key '$key'"
unless defined $self->{hooks}->[$key];
@@ -683,7 +683,7 @@ sub toggle_hook {
my $self = shift;
my $key = shift;
my $enabled = shift;
-
+
$self->{hooks}->[$key]->{enabled} = $enabled;
}
@@ -694,7 +694,7 @@ sub _add {
my $callback = shift;
my $enabled = shift;
$enabled = 1 unless defined $enabled;
-
+
if (ref($callback) eq "CODE") {
$callback = Net::DBus::Callback->new(method => $callback);
}
@@ -735,7 +735,7 @@ sub _remove {
my $type = shift;
my $fd = shift;
- die "no handle ($type) active with fd '$fd'"
+ die "no handle ($type) active with fd '$fd'"
unless exists $self->{fds}->{$type}->{$fd};
delete $self->{fds}->{$type}->{$fd};
diff --git a/lib/Net/DBus/RemoteService.pm b/lib/Net/DBus/RemoteService.pm
index c20db68..6624090 100644
--- a/lib/Net/DBus/RemoteService.pm
+++ b/lib/Net/DBus/RemoteService.pm
@@ -58,12 +58,12 @@ use Net::DBus::RemoteObject;
Creates a new handle for a remote service. The C<$bus> parameter is an
instance of L<Net::DBus>, C<$owner> is the name of the client providing the
-service, while C<$service_name> is the well known name of the service on
+service, while C<$service_name> is the well known name of the service on
the bus. Service names consist of two or more tokens, separated
by periods, while the tokens comprise the letters a-z, A-Z, 0-9 and _,
for example C<org.freedesktop.DBus>. There is generally no need to call
this constructor, instead the C<get_service> method on L<Net::DBus> should
-be used. This caches handles to remote services, eliminating repeated
+be used. This caches handles to remote services, eliminating repeated
retrieval of introspection data.
=cut
@@ -111,7 +111,7 @@ sub get_service_name {
=item my $owner_name = $service->get_owner_name;
Retrieves the name of the client owning the service at the
-time it was connected to.
+time it was connected to.
=cut
@@ -124,10 +124,10 @@ sub get_owner_name {
Retrieves a handle to the remote object provided by the service with
the name of C<$object_path>. If the optional C<$interface> parameter is
-provided, the object will immediately be cast to the designated
+provided, the object will immediately be cast to the designated
interface. NB, it is only neccessary to cast an object to a specific
interface if there are multiple interfaces on the object providing
-methods with the same name, or the remote object does support
+methods with the same name, or the remote object does support
introspection. The returned object will be an instance of L<Net::DBus::RemoteObject>.
=cut
@@ -135,7 +135,7 @@ introspection. The returned object will be an instance of L<Net::DBus::RemoteObj
sub get_object {
my $self = shift;
my $object_path = shift;
-
+
unless (defined $self->{objects}->{$object_path}) {
$self->{objects}->{$object_path} = Net::DBus::RemoteObject->new($self,
$object_path);
@@ -150,7 +150,7 @@ sub get_object {
}
1;
-
+
=pod
@@ -162,7 +162,7 @@ Daniel Berrange <dan at berrange.com>
=head1 COPYRIGHT
-Copright (C) 2004-2009, Daniel Berrange.
+Copright (C) 2004-2009, Daniel Berrange.
=head1 SEE ALSO
diff --git a/lib/Net/DBus/Service.pm b/lib/Net/DBus/Service.pm
index e96c503..e09c27f 100644
--- a/lib/Net/DBus/Service.pm
+++ b/lib/Net/DBus/Service.pm
@@ -76,7 +76,7 @@ sub new {
$self->{bus} = shift;
$self->{service_name} = shift;
$self->{objects} = {};
-
+
bless $self, $class;
$self->get_bus->get_connection->request_name($self->get_service_name);
@@ -98,7 +98,7 @@ sub get_bus {
=item my $name = $service->get_service_name
-Retrieves the qualified name by which this service is
+Retrieves the qualified name by which this service is
known on the bus.
=cut
@@ -113,7 +113,7 @@ sub _register_object {
my $self = shift;
my $object = shift;
#my $wildcard = shift || 0;
-
+
# if ($wildcard) {
# $self->get_bus->get_connection->
# register_fallback($object->get_object_path,
diff --git a/lib/Net/DBus/Test/MockConnection.pm b/lib/Net/DBus/Test/MockConnection.pm
index 1f5fe6c..264e7b8 100644
--- a/lib/Net/DBus/Test/MockConnection.pm
+++ b/lib/Net/DBus/Test/MockConnection.pm
@@ -46,7 +46,7 @@ Net::DBus::Test::MockConnection - Fake a connection to the bus unit testing
This object provides a fake implementation of the L<Net::DBus::Binding::Connection>
enabling a pure 'in-memory' message bus to be mocked up. This is intended to
-facilitate creation of unit tests for services which would otherwise need to
+facilitate creation of unit tests for services which would otherwise need to
call out to other object on a live message bus. It is used as a companion to
the L<Net::DBus::Test::MockObject> module which is how fake objects are to be
provided on the fake bus.
@@ -81,15 +81,15 @@ get a handle to a test bus.
sub new {
my $class = shift;
my $self = {};
-
+
$self->{replies} = [];
$self->{signals} = [];
$self->{objects} = {};
$self->{objectTrees} = {};
$self->{filters} = [];
-
+
bless $self, $class;
-
+
return $self;
}
@@ -100,7 +100,7 @@ a method call, it will be dispatched straight to any corresponding
mock object registered. If the mesage is an error or method return
it will be made available as a return value for the C<send_with_reply_and_block>
method. If the message is a signal it will be queued up for processing
-by the C<dispatch> method.
+by the C<dispatch> method.
=cut
@@ -124,7 +124,7 @@ sub send {
=item $bus->request_name($service_name)
-Pretend to send a request to the bus registering the well known
+Pretend to send a request to the bus registering the well known
name specified in the C<$service_name> parameter. In reality
this is just a no-op giving the impression that the name was
successfully registered.
@@ -135,7 +135,7 @@ sub request_name {
my $self = shift;
my $name = shift;
my $flags = shift;
-
+
# XXX do we care about this for test cases? probably not...
# ....famous last words
}
@@ -155,13 +155,13 @@ sub send_with_reply_and_block {
my $self = shift;
my $msg = shift;
my $timeout = shift;
-
+
$self->send($msg);
-
+
if ($#{$self->{replies}} == -1) {
die "no reply for " . $msg->get_path . "->" . $msg->get_member . " received within timeout";
}
-
+
my $reply = shift @{$self->{replies}};
if ($#{$self->{replies}} != -1) {
die "too many replies received";
@@ -188,7 +188,7 @@ pending signals to be dealt with.
sub dispatch {
my $self = shift;
-
+
my @signals = @{$self->{signals}};
$self->{signals} = [];
foreach my $msg (@signals) {
@@ -212,7 +212,7 @@ should be performed.
sub add_filter {
my $self = shift;
my $cb = shift;
-
+
push @{$self->{filters}}, $cb;
}
@@ -228,8 +228,8 @@ successfully registered.
sub add_match {
my $self = shift;
my $rule = shift;
-
- # XXX do we need to implement anything ? probably not
+
+ # XXX do we need to implement anything ? probably not
# nada
}
@@ -245,8 +245,8 @@ successfully unregistered.
sub remove_match {
my $self = shift;
my $rule = shift;
-
- # XXX do we need to implement anything ? probably not
+
+ # XXX do we need to implement anything ? probably not
# nada
}
@@ -266,13 +266,13 @@ sub register_object_path {
my $self = shift;
my $path = shift;
my $code = shift;
-
+
$self->{objects}->{$path} = $code;
}
=item $con->register_fallback($path, \&handler)
-Registers a handler for messages whose path starts with
+Registers a handler for messages whose path starts with
the prefix specified in the C<$path> parameter. The supplied
code reference will be invoked with two parameters, the
connection object on which the message was received,
@@ -285,7 +285,7 @@ sub register_fallback {
my $self = shift;
my $path = shift;
my $code = shift;
-
+
$self->{objects}->{$path} = $code;
$self->{objectTrees}->{$path} = $code;
}
@@ -301,7 +301,7 @@ or C<register_fallback> methods.
sub unregister_object_path {
my $self = shift;
my $path = shift;
-
+
delete $self->{objects}->{$path};
}
@@ -445,7 +445,7 @@ sub make_signal_message {
=head1 BUGS
-It doesn't completely replicate the API of L<Net::DBus::Binding::Connection>,
+It doesn't completely replicate the API of L<Net::DBus::Binding::Connection>,
merely enough to make the high level bindings work in a test scenario.
=head1 AUTHOR
diff --git a/lib/Net/DBus/Test/MockIterator.pm b/lib/Net/DBus/Test/MockIterator.pm
index 6541c73..5144446 100644
--- a/lib/Net/DBus/Test/MockIterator.pm
+++ b/lib/Net/DBus/Test/MockIterator.pm
@@ -203,7 +203,7 @@ sub append_object_path {
=item $iter->append_signature($val);
-Read or write a UTF-8 string, whose contents is a
+Read or write a UTF-8 string, whose contents is a
valid type signature, value from/to the message iterator
@@ -345,7 +345,7 @@ sub append_uint64 {
=item $iter->append_double($val);
-Read or write a double precision floating point value
+Read or write a double precision floating point value
from/to the message iterator
=cut
@@ -375,7 +375,7 @@ constants.
=cut
sub get {
- my $self = shift;
+ my $self = shift;
my $type = shift;
if (defined $type) {
@@ -450,7 +450,7 @@ sub get {
=item my $hashref = $iter->get_dict()
If the iterator currently points to a dictionary value, unmarshalls
-and returns the value as a hash reference.
+and returns the value as a hash reference.
=cut
@@ -476,7 +476,7 @@ sub get_dict {
=item my $hashref = $iter->get_array()
If the iterator currently points to an array value, unmarshalls
-and returns the value as a array reference.
+and returns the value as a array reference.
=cut
@@ -518,7 +518,7 @@ sub get_variant {
=item my $hashref = $iter->get_struct()
If the iterator currently points to an struct value, unmarshalls
-and returns the value as a array reference. The values in the array
+and returns the value as a array reference. The values in the array
correspond to members of the struct.
=cut
@@ -627,7 +627,7 @@ sub append {
=item my $type = $iter->guess_type($value)
-Make a best guess at the on the wire data type to use for
+Make a best guess at the on the wire data type to use for
marshalling C<$value>. If the value is a hash reference,
the dictionary type is returned; if the value is an array
reference the array type is returned; otherwise the string
@@ -648,7 +648,7 @@ sub guess_type {
if (!defined $subtype) {
if ($maintype == &Net::DBus::Binding::Message::TYPE_DICT_ENTRY) {
- $subtype = [ $self->guess_type(($value->value())[0]->[0]),
+ $subtype = [ $self->guess_type(($value->value())[0]->[0]),
$self->guess_type(($value->value())[0]->[1]) ];
} elsif ($maintype == &Net::DBus::Binding::Message::TYPE_ARRAY) {
$subtype = [ $self->guess_type(($value->value())[0]->[0]) ];
@@ -684,7 +684,7 @@ sub guess_type {
=item my $sig = $iter->format_signature($type)
-Given a data type representation, construct a corresponding
+Given a data type representation, construct a corresponding
signature string
=cut
@@ -700,7 +700,7 @@ sub format_signature {
if (ref($type) eq "ARRAY") {
while ($i <= $#{$type}) {
$t = $$type[$i];
-
+
if (ref($t) eq "ARRAY") {
$sig .= $self->format_signature($t);
} elsif ($t == &Net::DBus::Binding::Message::TYPE_DICT_ENTRY) {
@@ -711,13 +711,13 @@ sub format_signature {
} else {
$sig .= chr($t);
}
-
+
$i++;
}
} else {
$sig .= chr ($type);
}
-
+
return $sig;
}
@@ -733,7 +733,7 @@ sub append_array {
my $self = shift;
my $array = shift;
my $type = shift;
-
+
if (!defined($type)) {
$type = [$self->guess_type($array->[0])];
}
@@ -743,7 +743,7 @@ sub append_array {
my $sig = $self->format_signature($type);
my $iter = $self->_open_container(&Net::DBus::Binding::Message::TYPE_ARRAY, $sig);
-
+
foreach my $value (@{$array}) {
$iter->append($value, $type->[0]);
}
@@ -770,7 +770,7 @@ sub append_struct {
}
my $iter = $self->_open_container(&Net::DBus::Binding::Message::TYPE_STRUCT, "");
-
+
my @type = defined $type ? @{$type} : ();
foreach my $value (@{$struct}) {
$iter->append($value, shift @type);
@@ -797,7 +797,7 @@ sub append_dict {
$sig .= "}";
my $iter = $self->_open_container(&Net::DBus::Binding::Message::TYPE_ARRAY, $sig);
-
+
foreach my $key (keys %{$hash}) {
my $value = $hash->{$key};
my $entry = $iter->_open_container(&Net::DBus::Binding::Message::TYPE_DICT_ENTRY, $sig);
@@ -856,15 +856,15 @@ sub get_arg_type {
=item my $type = $iter->get_element_type
-If the iterator points to an array, retrieves the type code of
-array elements. The returned code will correspond to one of the
+If the iterator points to an array, retrieves the type code of
+array elements. The returned code will correspond to one of the
constants C<Net::DBus::Binding::Message::TYPE_*>
=cut
sub get_element_type {
my $self = shift;
-
+
die "current element is not valid" if $self->{position} > $#{$self->{data}};
my $data = $self->{data}->[$self->{position}];
diff --git a/lib/Net/DBus/Test/MockMessage.pm b/lib/Net/DBus/Test/MockMessage.pm
index ac3d697..3473721 100644
--- a/lib/Net/DBus/Test/MockMessage.pm
+++ b/lib/Net/DBus/Test/MockMessage.pm
@@ -208,7 +208,7 @@ an empty string if there is no applicable interface for this message.
sub get_interface {
my $self = shift;
-
+
return $self->{interface};
}
@@ -221,7 +221,7 @@ empty string if there is no applicable object for this message.
sub get_path {
my $self = shift;
-
+
return $self->{path};
}
@@ -235,7 +235,7 @@ the message is being broadcast to all clients.
sub get_destination {
my $self = shift;
-
+
return $self->{destination};
}
@@ -247,7 +247,7 @@ Retireves the unique name of the client sending the message
sub get_sender {
my $self = shift;
-
+
return $self->{sender};
}
@@ -262,7 +262,7 @@ is yet to be sent.
sub get_serial {
my $self = shift;
-
+
return $self->{serial};
}
@@ -275,7 +275,7 @@ while for signals, retrieves the name of the signal.
sub get_member {
my $self = shift;
-
+
return $self->{member};
}
@@ -317,7 +317,7 @@ an instance of the C<Net::DBus::Binding::Iterator> class.
sub iterator {
my $self = shift;
my $append = @_ ? shift : 0;
-
+
return Net::DBus::Test::MockIterator->_new(data => $self->{data},
append => $append);
}
@@ -325,13 +325,13 @@ sub iterator {
=item $boolean = $msg->get_no_reply()
Gets the flag indicating whether the message is expecting
-a reply to be sent.
+a reply to be sent.
=cut
sub get_no_reply {
my $self = shift;
-
+
return $self->{no_reply};
}
@@ -347,13 +347,13 @@ is reduced by removing the need for the client to wait
sub set_no_reply {
my $self = shift;
-
+
$self->{no_reply} = shift;
}
=item my @values = $msg->get_args_list
-De-marshall all the values in the body of the message, using the
+De-marshall all the values in the body of the message, using the
message signature to identify data types. The values are returned
as a list.
@@ -361,8 +361,8 @@ as a list.
sub get_args_list {
my $self = shift;
-
- my @ret;
+
+ my @ret;
my $iter = $self->iterator;
if ($iter->get_arg_type() != &Net::DBus::Binding::Message::TYPE_INVALID) {
do {
@@ -385,7 +385,7 @@ the L<Net::DBus::Binding::Iterator> object should be used instead.
sub append_args_list {
my $self = shift;
my @args = @_;
-
+
my $iter = $self->iterator(1);
foreach my $arg (@args) {
$iter->append($arg);
diff --git a/lib/Net/DBus/Test/MockObject.pm b/lib/Net/DBus/Test/MockObject.pm
index 41d00d9..3aae182 100644
--- a/lib/Net/DBus/Test/MockObject.pm
+++ b/lib/Net/DBus/Test/MockObject.pm
@@ -31,7 +31,7 @@ Net::DBus::Test::MockObject - Fake an object from the bus for unit testing
# Lets fake presence of HAL...
- # First we need to define the service
+ # First we need to define the service
my $service = $bus->export_service("org.freedesktop.Hal");
# Then create a mock object
@@ -39,7 +39,7 @@ Net::DBus::Test::MockObject - Fake an object from the bus for unit testing
"/org/freedesktop/Hal/Manager");
# Fake the 'GetAllDevices' method
- $object->seed_action("org.freedesktop.Hal.Manager",
+ $object->seed_action("org.freedesktop.Hal.Manager",
"GetAllDevices",
reply => {
return => [ "/org/freedesktop/Hal/devices/computer_i8042_Aux_Port",
@@ -55,8 +55,8 @@ Net::DBus::Test::MockObject - Fake an object from the bus for unit testing
=head1 DESCRIPTION
-This provides an alternate for L<Net::DBus::Object> to enable bus
-objects to be quickly mocked up, thus facilitating creation of unit
+This provides an alternate for L<Net::DBus::Object> to enable bus
+objects to be quickly mocked up, thus facilitating creation of unit
tests for services which may need to call out to objects provided
by 3rd party services on the bus. It is typically used as a companion
to the L<Net::DBus::MockBus> object, to enable complex services to
@@ -92,7 +92,7 @@ and C<$interface> defines the interface it will support.
sub new {
my $class = shift;
my $self = {};
-
+
$self->{service} = shift;
$self->{object_path} = shift;
$self->{interface} = shift;
@@ -100,7 +100,7 @@ sub new {
$self->{message} = shift;
bless $self, $class;
-
+
$self->get_service->_register_object($self);
return $self;
@@ -174,7 +174,7 @@ sub get_last_message_param {
=item my @values = $object->get_last_message_param_list
-Returns a list of all the values supplied as arguments to
+Returns a list of all the values supplied as arguments to
the last processed message.
=cut
@@ -196,7 +196,7 @@ keys set:
=item signals
-Causes a signal to be emitted when the method is invoked. The
+Causes a signal to be emitted when the method is invoked. The
value associated with this key should be an instance of the
L<Net::DBus::Binding::Message::Signal> class.
@@ -222,7 +222,7 @@ sub seed_action {
my $interface = shift;
my $method = shift;
my %action = @_;
-
+
$self->{actions}->{$method} = {} unless exists $self->{actions}->{$method};
$self->{actions}->{$method}->{$interface} = \%action;
}
@@ -231,7 +231,7 @@ sub _dispatch {
my $self = shift;
my $connection = shift;
my $message = shift;
-
+
my $interface = $message->get_interface;
my $method = $message->get_member;
@@ -244,7 +244,7 @@ sub _dispatch {
$con->send($error);
return;
}
-
+
my $action;
if ($interface) {
if (!exists $self->{actions}->{$method}->{$interface}) {
@@ -278,7 +278,7 @@ sub _dispatch {
}
$self->{message} = $message;
-
+
if (exists $action->{error}) {
my $error = $con->make_error_message($message,
$action->{error}->{name},
@@ -303,7 +303,7 @@ sub _dispatch {
=head1 BUGS
-It doesn't completely replicate the API of L<Net::DBus::Binding::Object>,
+It doesn't completely replicate the API of L<Net::DBus::Binding::Object>,
merely enough to make the high level bindings work in a test scenario.
=head1 AUTHOR
diff --git a/lib/Net/DBus/Tutorial/ExportingObjects.pod b/lib/Net/DBus/Tutorial/ExportingObjects.pod
index e6e2064..a95b073 100644
--- a/lib/Net/DBus/Tutorial/ExportingObjects.pod
+++ b/lib/Net/DBus/Tutorial/ExportingObjects.pod
@@ -28,7 +28,7 @@ Net::DBus::Tutorial::ExportingObjects - tutorials on providing a DBus service
This document provides a tutorial on providing a DBus service using the
Perl Net::DBus application bindings. This examples in this document
-will be based on the code from the L<Music::Player> distribution, which
+will be based on the code from the L<Music::Player> distribution, which
is a simple DBus service providing a music track player.
=head1 CREATING AN OBJECT
@@ -52,18 +52,18 @@ within the constructor:
my $class = shift;
my $service = shift;
my $self = $class->SUPER::new($service, "/music/player/manager");
-
+
bless $self, $class;
-
+
return $self;
}
1;
-Now, as mentioned, the manager with handle a number of different
+Now, as mentioned, the manager with handle a number of different
player backends. So we need to provide methods for registering
-new backends, and querying for backends capable of playing a
+new backends, and querying for backends capable of playing a
particular file type. So modifying the above code we add a hash
table in the constructor, to store the backends:
@@ -74,9 +74,9 @@ table in the constructor, to store the backends:
my $self = $class->SUPER::new($service, "/music/player/manager");
$self->{backends} = {};
-
+
bless $self, $class;
-
+
return $self;
}
@@ -88,8 +88,8 @@ a path under which to register the backend. We use the C<get_service>
method to retreieve a reference to the service the manager is
attached to, and attach the player backend to this same service:
When a method on DBus object is invoked, the first parameter is
-the object reference (C<$self>), and the remainder are the
-parameters provided to the method call. Thus writing a method
+the object reference (C<$self>), and the remainder are the
+parameters provided to the method call. Thus writing a method
implementation on a DBUs is really no different to normal object
oriented Perl (cf L<perltoot>):
@@ -109,19 +109,19 @@ oriented Perl (cf L<perltoot>):
Looking at this one might wonder what happens if the C<die>
method is triggered. In such a scenario, rather than terminating
-the service process, the error will be caught and propagated back
+the service process, the error will be caught and propagated back
to the remote caller to deal with.
The player backends provide a method C<get_track_types> which returns
-an array reference of the music track types they support. We can use
-this method to provide an API to allow easy retrieval of a backend
-for a particular track type. This method will return a path with which
+an array reference of the music track types they support. We can use
+this method to provide an API to allow easy retrieval of a backend
+for a particular track type. This method will return a path with which
the backend object can be accessed
sub find_backend {
my $self = shift;
my $extension = shift;
-
+
foreach my $name (keys %{$self->{backends}}) {
my $backend = $self->{backends}->{$name};
foreach my $type (@{$backend->get_track_types}) {
@@ -130,14 +130,14 @@ the backend object can be accessed
}
}
}
-
+
die "no backend for type $extension";
}
Lets take a quick moment to consider how this method would be used to
play a music track. If you've not already done so, refresh your memory
-from L<Net::DBus::Tutorial::UsingObjects>. Now, we have an MP3 file
-which we wish to play, so we search for the path to a backend, then
+from L<Net::DBus::Tutorial::UsingObjects>. Now, we have an MP3 file
+which we wish to play, so we search for the path to a backend, then
retrieve the object for it, and play the track:
...get the music player service...
@@ -152,7 +152,7 @@ retrieve the object for it, and play the track:
=head1 PROVIDING INTROSPECTION DATA
The code above is a complete working object, ready to be registered with
-a service, and since the parameters and return values for the two methods
+a service, and since the parameters and return values for the two methods
are both simple strings we could stop there. In some cases, however, one
might want to be more specific about data types expected for parameters,
for example signed vs unsigned integers. Adding explicit data typing also
@@ -163,7 +163,7 @@ service whom may be using a strongly typed language such as C.
The first step in providing introspection data for a DBus object in Perl, is
to specify the name of the interface provided by the object. This is typically
-a period separated string, by convention containing the domain name of the
+a period separated string, by convention containing the domain name of the
application as its first component. Since most Perl modules end up living on
CPAN, one might use C<org.cpan> as the first component, followed by the package
name of the module (replacing :: with .), eg C<org.cpan.music.player.manager>. If it is
@@ -212,16 +212,16 @@ a service. A service is nothing more than a well known name
for a given API contract. A contract can be thought of as a
definition of a list of object paths, and the corresponding
interfaces they provide. So, someone else could come along a
-provide an alternate music player implementation using the
+provide an alternate music player implementation using the
Python or QT bindings for DBus, and if they provided the same
set of object paths & interfaces, they could justifiably register
-the same service on the bus.
+the same service on the bus.
The L<Net::DBus::Service> module provides the means to register
a service. Its constructor expects a reference to the bus object
(an instance of L<Net::DBus>), along with the name of the service.
-As with interface names, the first component of a service name is
-usually derived from a domain name, and then suffixed with the
+As with interface names, the first component of a service name is
+usually derived from a domain name, and then suffixed with the
name of the application, in our example forming C<org.cpan.Music.Player>.
While some objects will be created on the fly during execution
of the application, others are created upon initial startup. The
@@ -266,7 +266,7 @@ In the former one would use the C<session> or <system> methods on L<Net::DBus>
to get a handle to the desired bus, while in the latter case, the C<find>
method would be used. This applies a heuristic to determine the correct
bus based on execution environment. In the case of the music player, either
-bus is relevant, so the code to connect the service to the bus would look
+bus is relevant, so the code to connect the service to the bus would look
like:
use Net::DBus;
@@ -274,7 +274,7 @@ like:
my $bus = Net::DBus->find;
my $player = Music::Player->new($bus);
-With the service attached to the bus, it is merely neccessary to run
+With the service attached to the bus, it is merely neccessary to run
the main event processing loop to listen out for & handle incoming
DBus messages. So the above code is modified to start a simple reactor:
@@ -288,14 +288,14 @@ DBus messages. So the above code is modified to start a simple reactor:
exit 0;
-Saving this code into a script C</usr/bin/music-player.pl>, coding
+Saving this code into a script C</usr/bin/music-player.pl>, coding
is complete and the service ready for use by clients on the bus.
=head1 SERVICE ACTIVATION
-One might now wonder how best to start the service, particularly
+One might now wonder how best to start the service, particularly
if it is a service capable of running on
-both the system and session buses. DBus has the answer in the
+both the system and session buses. DBus has the answer in the
concept of C<activation>. What happens is that when a client
on the bus attempts to call a method, or register a signal
handler against, a service not currently running, it will first
@@ -304,8 +304,8 @@ in this process merely need stick a simple service definition
file into the directoy C</usr/share/dbus-1/services>. The file
should be named to match the service name, with the file extension
C<.service> appended. eg, C</usr/share/dbus-1/services/org.cpan.music.player.service>
-The file contains two keys, first the name of the service, and
-second the name of the executable used to run the service, or in
+The file contains two keys, first the name of the service, and
+second the name of the executable used to run the service, or in
this case the Perl script. So, for our simple service the data
file would contain:
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libnet-dbus-perl.git
More information about the Pkg-perl-cvs-commits
mailing list