diff options
| author | Hans Nilsson <[email protected]> | 2016-06-30 12:21:54 +0200 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2016-06-30 12:21:54 +0200 |
| commit | 7c91a9c8d4a05ab254b89a6b1d700ff794017579 (patch) | |
| tree | 7e2d541ccb89b0a1859b1fc9c9ee6cd930f72cd0 /lib/inets/src/ftp/ftp.erl | |
| parent | c2157dc06a8c997c207dd82cd6fa11dbcb508f11 (diff) | |
| parent | 0573efbc18fc20f8646cf3ff64d2affd06e03cb8 (diff) | |
| download | otp-7c91a9c8d4a05ab254b89a6b1d700ff794017579.tar.gz otp-7c91a9c8d4a05ab254b89a6b1d700ff794017579.tar.bz2 otp-7c91a9c8d4a05ab254b89a6b1d700ff794017579.zip | |
Merge branch 'maint-19' into maint
Diffstat (limited to 'lib/inets/src/ftp/ftp.erl')
| -rw-r--r-- | lib/inets/src/ftp/ftp.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/inets/src/ftp/ftp.erl b/lib/inets/src/ftp/ftp.erl index bbf25f8e90..8bad91bf98 100644 --- a/lib/inets/src/ftp/ftp.erl +++ b/lib/inets/src/ftp/ftp.erl @@ -106,8 +106,8 @@ -type common_reason() :: 'econn' | 'eclosed' | term(). -type file_write_error_reason() :: term(). % See file:write for more info -%%-define(DBG(F,A), 'n/a'). --define(DBG(F,A), io:format(F,A)). +-define(DBG(F,A), 'n/a'). +%%-define(DBG(F,A), io:format(F,A)). %%%========================================================================= %%% API - CLIENT FUNCTIONS @@ -2099,7 +2099,7 @@ handle_ctrl_result({pos_prel, _}, #state{caller = {transfer_data, Bin}} %%-------------------------------------------------------------------------- %% Default -handle_ctrl_result({Status, Lines}, #state{client = From} = State) +handle_ctrl_result({Status, _Lines}, #state{client = From} = State) when From =/= undefined -> ctrl_result_response(Status, State, {error, Status}). |