[libnet-dbus-perl] 263/335: Include param names in method/signal output

[Intrigeri]

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 7db71852097162953951264c3fa6bbb6a865d224
Author: Daniel P. Berrange <berrange at redhat.com>
Date:   Sat Feb 16 14:13:05 2008 -0500

    Include param names in method/signal output
---
 lib/Net/DBus/Dumper.pm | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/lib/Net/DBus/Dumper.pm b/lib/Net/DBus/Dumper.pm
index 18cb1eb..bd9a784 100644
--- a/lib/Net/DBus/Dumper.pm
+++ b/lib/Net/DBus/Dumper.pm
@@ -123,17 +123,23 @@ sub _dbus_dump_introspector {
 	push @data, "  Interface: ", $interface, "\n";
 	foreach my $method ($ins->list_methods($interface)) {
 	    push @data, "    Method: ", $method, "\n";
+	    my @paramnames = $ins->get_method_param_names($interface, $method);
 	    foreach my $param ($ins->get_method_params($interface, $method)) {
-		push @data, &_dbus_dump_types("      > ", $param);
+		my $name = @paramnames ? shift @paramnames : undef;
+		push @data, &_dbus_dump_types("      > ", $param, $name);
 	    }
+	    my @returnnames = $ins->get_method_return_names($interface, $method);
 	    foreach my $param ($ins->get_method_returns($interface, $method)) {
-		push @data, &_dbus_dump_types("      < ", $param);
+		my $name = @returnnames ? shift @returnnames : undef;
+		push @data, &_dbus_dump_types("      < ", $param, $name);
 	    }
 	}
 	foreach my $signal ($ins->list_signals($interface)) {
 	    push @data, "    Signal: ", $signal, "\n";
+	    my @paramnames = $ins->get_signal_param_names($interface, $signal);
 	    foreach my $param ($ins->get_signal_params($interface, $signal)) {
-		push @data, &_dbus_dump_types("      > ", $param);
+		my $name = @paramnames ? shift @paramnames : undef;
+		push @data, &_dbus_dump_types("      > ", $param, $name);
 	    }
 	}
     }
@@ -143,15 +149,25 @@ sub _dbus_dump_introspector {
 sub _dbus_dump_types {
     my $indent = shift;
     my $type = shift;
+    my $name = shift;
     
     my @data;
+    push @data, $indent;
     if (ref($type)) {
-	push @data, $indent, $type->[0], "\n";
+	push @data, $type->[0];
+	if (defined $name) {
+	    push @data, " ($name)";
+	}
+	push @data, "\n";
 	for (my $i = 1 ; $i <= $#{$type} ; $i++) {
 	    push @data, &_dbus_dump_types($indent . "  ", $type->[$i]);
 	}
     } else {
-	push @data, $indent, $type, "\n";
+	push @data, $type;
+	if (defined $name) {
+	    push @data, " ($name)";
+	}
+	push @data, "\n";
     }
     return @data;
 }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libnet-dbus-perl.git