aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssh/src/ssh_channel.erl
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2013-01-28 10:26:10 +0100
committerIngela Anderton Andin <[email protected]>2013-01-28 10:26:10 +0100
commitcab17a9f36d2343e01f6aef64416d2a42308c25b (patch)
tree3a967eb1439bf63b786c0647924341f2a99e1793 /lib/ssh/src/ssh_channel.erl
parentd1b2ad49e74dc78cee737469b467e056a0b07f55 (diff)
parent089f235dd2c2945a63383e79e02616c1a99b50a6 (diff)
downloadotp-cab17a9f36d2343e01f6aef64416d2a42308c25b.tar.gz
otp-cab17a9f36d2343e01f6aef64416d2a42308c25b.tar.bz2
otp-cab17a9f36d2343e01f6aef64416d2a42308c25b.zip
Merge branch 'ia/ssh/dialyzer-and-doc'
* ia/ssh/dialyzer-and-doc: ssh: Fix dialyzer and doc warnings
Diffstat (limited to 'lib/ssh/src/ssh_channel.erl')
-rw-r--r--lib/ssh/src/ssh_channel.erl7
1 files changed, 2 insertions, 5 deletions
diff --git a/lib/ssh/src/ssh_channel.erl b/lib/ssh/src/ssh_channel.erl
index 4e8f8538c2..062ed764ca 100644
--- a/lib/ssh/src/ssh_channel.erl
+++ b/lib/ssh/src/ssh_channel.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
%%
%% The contents of this file are subject to the Erlang Public License,
%% Version 1.1, (the "License"); you may not use this file except in
@@ -48,10 +48,7 @@
{ok, NewState :: term()} | {error, Reason :: term()}.
-callback handle_msg(Msg ::term(), State :: term()) ->
- {noreply, NewState :: term()} |
- {noreply, NewState :: term(), timeout() | hibernate} |
- {stop, Reason :: term(), NewState :: term()}.
-
+ {ok, State::term()} | {stop, ChannelId::integer(), State::term()}.
-callback handle_ssh_msg({ssh_cm, ConnectionRef::term(), SshMsg::term()},
State::term()) -> {ok, State::term()} |