aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcus Arendt <[email protected]>2014-12-05 14:50:54 +0100
committerMarcus Arendt <[email protected]>2014-12-05 14:50:54 +0100
commit37cb0c2a79e94d184c996ebe67bf46a07336aec8 (patch)
tree898475ab8504bfbf1d2759da7549d0805a99bbd4
parent58f42056a6386b16edd647721df046db3581739b (diff)
parente2242fb7fa98feec9242c71a473af7e99d6a7bd1 (diff)
downloadotp-37cb0c2a79e94d184c996ebe67bf46a07336aec8.tar.gz
otp-37cb0c2a79e94d184c996ebe67bf46a07336aec8.tar.bz2
otp-37cb0c2a79e94d184c996ebe67bf46a07336aec8.zip
Merge branch 'maint'
-rw-r--r--lib/ssh/src/ssh_connection.erl12
1 files changed, 3 insertions, 9 deletions
diff --git a/lib/ssh/src/ssh_connection.erl b/lib/ssh/src/ssh_connection.erl
index 593443e11c..01141622d6 100644
--- a/lib/ssh/src/ssh_connection.erl
+++ b/lib/ssh/src/ssh_connection.erl
@@ -107,15 +107,9 @@ shell(ConnectionHandler, ChannelId) ->
%% Description: Executes a predefined subsystem.
%%--------------------------------------------------------------------
subsystem(ConnectionHandler, ChannelId, SubSystem, TimeOut) ->
- case ssh_connection_handler:request(ConnectionHandler, self(),
- ChannelId, "subsystem",
- true, [?string(SubSystem)], TimeOut) of
- success -> success;
- failure -> failure;
- {error,timeout} -> {error,timeout};
- _ -> failure
- end.
-
+ ssh_connection_handler:request(ConnectionHandler, self(),
+ ChannelId, "subsystem",
+ true, [?string(SubSystem)], TimeOut).
%%--------------------------------------------------------------------
-spec send(pid(), channel_id(), iodata()) ->
ok | {error, closed}.