Skip to content

Commit

Permalink
[backend] BSServer: simplify request cleanup
Browse files Browse the repository at this point in the history
Too bad I didn't know that perl feature some years ago...
  • Loading branch information
mlschroe committed Dec 13, 2017
1 parent 316e03c commit 48a20a4
Showing 1 changed file with 6 additions and 12 deletions.
18 changes: 6 additions & 12 deletions src/backend/BSServer.pm
Original file line number Diff line number Diff line change
Expand Up @@ -670,32 +670,26 @@ sub read_file {
die("read_file: no content attached\n") unless have_content();
my $req = $BSServer::request;
send_continue() if $req->{'need_continue'};
$req->{'__socket'} = \*CLNT;
my $res = BSHTTP::file_receiver($req, {'filename' => $filename, @args});
delete $req->{'__socket'};
return $res;
local $req->{'__socket'} = \*CLNT;
return BSHTTP::file_receiver($req, {'filename' => $filename, @args});
}

sub read_cpio {
my ($dirname, @args) = @_;
die("read_cpio: no content attached\n") unless have_content();
my $req = $BSServer::request;
send_continue() if $req->{'need_continue'};
$req->{'__socket'} = \*CLNT;
my $res = BSHTTP::cpio_receiver($req, {'directory' => $dirname, @args});
delete $req->{'__socket'};
return $res;
local $req->{'__socket'} = \*CLNT;
return BSHTTP::cpio_receiver($req, {'directory' => $dirname, @args});
}

sub read_data {
my ($maxl, $exact) = @_;
die("read_data: no content attached\n") unless have_content();
my $req = $BSServer::request;
send_continue() if $req->{'need_continue'};
$req->{'__socket'} = \*CLNT;
my $res = BSHTTP::read_data($req, $maxl, $exact);
delete $req->{'__socket'};
return $res;
local $req->{'__socket'} = \*CLNT;
return BSHTTP::read_data($req, $maxl, $exact);
}

###########################################################################
Expand Down

0 comments on commit 48a20a4

Please sign in to comment.