From: Ralf Ertzinger Date: Mon, 12 Jan 2009 20:34:33 +0000 (+0100) Subject: - Reindent X-Git-Url: https://git.camperquake.de/gitweb.cgi?p=xmlrtorrent.git;a=commitdiff_plain;h=ba42ec7d8992f8baea148b4241964eeba3d7d3b7 - Reindent --- diff --git a/xmlrtorrent/SocketTalker.pm b/xmlrtorrent/SocketTalker.pm index 14b6590..a28f141 100644 --- a/xmlrtorrent/SocketTalker.pm +++ b/xmlrtorrent/SocketTalker.pm @@ -4,8 +4,8 @@ # licensed under GNU GPL v2 package xmlrtorrent::SocketTalker; -use xmlrtorrent::TalkerBase; -@ISA = qw(xmlrtorrent::TalkerBase); +use xmlrtorrent::RTorrentTalkerBase; +@ISA = qw(xmlrtorrent::RTorrentTalkerBase); use RPC::XML; use RPC::XML::Parser; @@ -19,7 +19,7 @@ sub new { $self->{'NAME'} = 'socket'; $self->{'DESC'} = 'talker using SCGI over Unix Domain Socket'; $self->{'_PARAMS'} = { - 'SOCKET' => ['', 'filename of socket'], + 'SOCKET' => ['', 'filename of socket'], }; $self->{'__RPCXMLPARSER'} = RPC::XML::Parser->new(); @@ -50,15 +50,15 @@ sub send_request { my $socketfile = $self->_getval('SOCKET'); unless (defined $socketfile and $socketfile ne '') { - return 'socket talker: SOCKET not set'; + return 'socket talker: SOCKET not set'; } # prepare socket my $socket = IO::Socket::UNIX->new( - 'Type' => SOCK_STREAM, - 'Peer' => $socketfile, - ) - or return "socket talker: cannot connect to SOCKET: $!"; + 'Type' => SOCK_STREAM, + 'Peer' => $socketfile, + ) + or return "socket talker: cannot connect to SOCKET: $!"; $socket->autoflush(1); # default since 1.18, but be sure # prepare XML RPC request @@ -66,24 +66,24 @@ sub send_request { # prpepare SCGI request my $scgi_request = - $self->_create_netstring( - $self->_create_scgi_header('CONTENT_LENGTH', length $rpc_request) - . - $self->_create_scgi_header('SCGI', '1') - ) - . - $rpc_request; + $self->_create_netstring( + $self->_create_scgi_header('CONTENT_LENGTH', length $rpc_request) + . + $self->_create_scgi_header('SCGI', '1') + ) + . + $rpc_request; # write to socket $socket->print($scgi_request); # read from socket while (my $line = <$socket>) { - last if ($line =~ /^\s*$/); # munch headers + last if ($line =~ /^\s*$/); # munch headers } my $ret = ''; while (my $line = <$socket>) { - $ret .= $line; + $ret .= $line; } $socket->close() or return "socket talker: cannot close SOCKET: $!";