diff options
author | Ingela Anderton Andin <[email protected]> | 2013-01-28 10:26:10 +0100 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2013-01-28 10:26:10 +0100 |
commit | cab17a9f36d2343e01f6aef64416d2a42308c25b (patch) | |
tree | 3a967eb1439bf63b786c0647924341f2a99e1793 /lib/ssh/src/ssh_sftpd.erl | |
parent | d1b2ad49e74dc78cee737469b467e056a0b07f55 (diff) | |
parent | 089f235dd2c2945a63383e79e02616c1a99b50a6 (diff) | |
download | otp-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_sftpd.erl')
-rw-r--r-- | lib/ssh/src/ssh_sftpd.erl | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/ssh/src/ssh_sftpd.erl b/lib/ssh/src/ssh_sftpd.erl index c7e8373840..3d469d3c6e 100644 --- a/lib/ssh/src/ssh_sftpd.erl +++ b/lib/ssh/src/ssh_sftpd.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2005-2012. All Rights Reserved. +%% Copyright Ericsson AB 2005-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 @@ -23,8 +23,7 @@ -module(ssh_sftpd). -%%-behaviour(gen_server). --behaviour(ssh_subsystem). +-behaviour(ssh_daemon_channel). -include_lib("kernel/include/file.hrl"). @@ -159,7 +158,7 @@ handle_ssh_msg({ssh_cm, _, {exit_status, ChannelId, Status}}, State) -> {stop, ChannelId, State}. %%-------------------------------------------------------------------- -%% Function: handle_ssh_msg(Args) -> {ok, State} | {stop, ChannelId, State} +%% Function: handle_msg(Args) -> {ok, State} | {stop, ChannelId, State} %% %% Description: Handles other messages %%-------------------------------------------------------------------- |