File 0197-ftp-fix-handle_ctrl_result-tls_upgrade-_-r... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 0197-ftp-fix-handle_ctrl_result-tls_upgrade-_-return-and-.patch of Package erlang (Revision 15a42b5a9f7bbf72ee3d2d11dbadf6c5)

Currently displaying revision 15a42b5a9f7bbf72ee3d2d11dbadf6c5 , Show latest

From fb41cd2a42c2455be166edc2e86b7110b96d15ca Mon Sep 17 00:00:00 2001
From: Alexander Clouter <alex@digriz.org.uk>
Date: Thu, 28 May 2020 16:14:24 +0100
Subject: [PATCH 07/14] ftp: fix handle_ctrl_result({tls_upgrade, _} return and
 cosmetic s/ERROR/Error/g

---
 lib/ftp/src/ftp.erl | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/lib/ftp/src/ftp.erl b/lib/ftp/src/ftp.erl
index 5108d681b1..645d8de25a 100644
--- a/lib/ftp/src/ftp.erl
+++ b/lib/ftp/src/ftp.erl
@@ -1604,7 +1604,7 @@ handle_ctrl_result({tls_upgrade, _}, #state{csock = {tcp, Socket},
             State = activate_ctrl_connection(State1),
             {noreply, State#state{tls_upgrading_data_connection = {true, pbsz}} };
         {error, _} = Error ->
-            gen_server:reply(From, {Error, self()}),
+            gen_server:reply(From, Error),
             {stop, normal, State0#state{client = undefined,
                                         caller = undefined,
                                         tls_upgrading_data_connection = false}}
@@ -1756,12 +1756,12 @@ handle_ctrl_result({pos_prel, _}, #state{caller = {dir, Dir}} = State0) ->
         {ok, State1} ->
             State = activate_data_connection(State1),
             {noreply, State#state{caller = {handle_dir_result, Dir}}};
-        {error, _Reason} = ERROR ->
+        {error, _Reason} = Error ->
             case State0#state.client of
                 undefined ->
-                    {stop, ERROR, State0};
+                    {stop, Error, State0};
                 From ->
-                    gen_server:reply(From, ERROR),
+                    gen_server:reply(From, Error),
                     {stop, normal, State0#state{client = undefined}}
             end
     end;
@@ -1865,12 +1865,12 @@ handle_ctrl_result({pos_prel, _}, #state{caller = recv_bin} = State0) ->
         {ok, State1} ->
             State = activate_data_connection(State1),
             {noreply, State};
-        {error, _Reason} = ERROR ->
+        {error, _Reason} = Error ->
             case State0#state.client of
                 undefined ->
-                    {stop, ERROR, State0};
+                    {stop, Error, State0};
                 From ->
-                    gen_server:reply(From, ERROR),
+                    gen_server:reply(From, Error),
                     {stop, normal, State0#state{client = undefined}}
             end
     end;
@@ -1899,12 +1899,12 @@ handle_ctrl_result({pos_prel, _}, #state{client = From,
         {ok, State1} ->
             State = start_chunk(State1),
             {noreply, State};
-        {error, _Reason} = ERROR ->
+        {error, _Reason} = Error ->
             case State0#state.client of
                 undefined ->
-                    {stop, ERROR, State0};
+                    {stop, Error, State0};
                 From ->
-                    gen_server:reply(From, ERROR),
+                    gen_server:reply(From, Error),
                     {stop, normal, State0#state{client = undefined}}
             end
     end;
@@ -1940,12 +1940,12 @@ handle_ctrl_result({pos_prel, _}, #state{caller = {recv_file, _}} = State0) ->
         {ok, State1} ->
             State = activate_data_connection(State1),
             {noreply, State};
-        {error, _Reason} = ERROR ->
+        {error, _Reason} = Error ->
             case State0#state.client of
                 undefined ->
-                    {stop, ERROR, State0};
+                    {stop, Error, State0};
                 From ->
-                    gen_server:reply(From, ERROR),
+                    gen_server:reply(From, Error),
                     {stop, normal, State0#state{client = undefined}}
             end
     end;
@@ -1962,12 +1962,12 @@ handle_ctrl_result({pos_prel, _}, #state{caller = {transfer_file, Fd}}
     case accept_data_connection(State0) of
         {ok, State1} ->
             send_file(State1, Fd);
-        {error, _Reason} = ERROR ->
+        {error, _Reason} = Error ->
             case State0#state.client of
                 undefined ->
-                    {stop, ERROR, State0};
+                    {stop, Error, State0};
                 From ->
-                    gen_server:reply(From, ERROR),
+                    gen_server:reply(From, Error),
                     {stop, normal, State0#state{client = undefined}}
             end
     end;
@@ -1977,12 +1977,12 @@ handle_ctrl_result({pos_prel, _}, #state{caller = {transfer_data, Bin}}
     case accept_data_connection(State0) of
         {ok, State} ->
             send_bin(State, Bin);
-        {error, _Reason} = ERROR ->
+        {error, _Reason} = Error ->
             case State0#state.client of
                 undefined ->
-                    {stop, ERROR, State0};
+                    {stop, Error, State0};
                 From ->
-                    gen_server:reply(From, ERROR),
+                    gen_server:reply(From, Error),
                     {stop, normal, State0#state{client = undefined}}
             end
     end;
-- 
2.26.2

Places

File 0197-ftp-fix-handle_ctrl_result-tls_upgrade-_-return-and-.patch of Package erlang (Revision 15a42b5a9f7bbf72ee3d2d11dbadf6c5)

Places