aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2016-06-29 17:42:52 +0200
committerErlang/OTP <[email protected]>2016-06-29 17:42:52 +0200
commit932cda08f6a1e08fd908097276fd10529b7d8e29 (patch)
tree85cd61807d7f7923b635bafa4c821511b9c024df /lib
parent1d4bbde0a9c85849025c5f03bcc76ed014ced395 (diff)
parent594ce0721b872e93cd8b7522224902e66af8dfa6 (diff)
downloadotp-932cda08f6a1e08fd908097276fd10529b7d8e29.tar.gz
otp-932cda08f6a1e08fd908097276fd10529b7d8e29.tar.bz2
otp-932cda08f6a1e08fd908097276fd10529b7d8e29.zip
Merge branch 'hans/inets/ftp_debug_printout/OTP-13712' into maint-19
* hans/inets/ftp_debug_printout/OTP-13712: inets: updated version inets: unused var in ftp.erl anonymized inets: ftp debug printout removed
Diffstat (limited to 'lib')
-rw-r--r--lib/inets/src/ftp/ftp.erl6
-rw-r--r--lib/inets/vsn.mk2
2 files changed, 4 insertions, 4 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}).
diff --git a/lib/inets/vsn.mk b/lib/inets/vsn.mk
index 543e0d44fd..3408c3b128 100644
--- a/lib/inets/vsn.mk
+++ b/lib/inets/vsn.mk
@@ -19,6 +19,6 @@
# %CopyrightEnd%
APPLICATION = inets
-INETS_VSN = 6.3
+INETS_VSN = 6.3.1
PRE_VSN =
APP_VSN = "$(APPLICATION)-$(INETS_VSN)$(PRE_VSN)"