Rollback a few recent Erlang changes to fix blame data
My combined patch for THRIFT-599 was committed, but it is preferable
commit the individual patches to preserve the more detailed log and
blame data. I'll recommit r987018 as a sequence of patches and r988722
as its own rev.
git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@990957 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/lib/erl/src/thrift_transport.erl b/lib/erl/src/thrift_transport.erl
index 39f8c05..20c4b5d 100644
--- a/lib/erl/src/thrift_transport.erl
+++ b/lib/erl/src/thrift_transport.erl
@@ -37,42 +37,21 @@
-record(transport, {module, data}).
--ifdef(transport_wrapper_module).
--define(debug_wrap(Transport),
- case Transport#transport.module of
- ?transport_wrapper_module ->
- Transport;
- _Else ->
- {ok, Result} = ?transport_wrapper_module:new(Transport),
- Result
- end).
--else.
--define(debug_wrap(Transport), Transport).
--endif.
-
new(Module, Data) when is_atom(Module) ->
- Transport0 = #transport{module = Module, data = Data},
- Transport1 = ?debug_wrap(Transport0),
- {ok, Transport1}.
+ {ok, #transport{module = Module,
+ data = Data}}.
--spec write(#transport{}, iolist() | binary()) -> {#transport{}, ok | {error, _Reason}}.
+%% Data :: iolist()
write(Transport, Data) ->
Module = Transport#transport.module,
- {NewTransData, Result} = Module:write(Transport#transport.data, Data),
- {Transport#transport{data = NewTransData}, Result}.
+ Module:write(Transport#transport.data, Data).
--spec read(#transport{}, non_neg_integer()) -> {#transport{}, {ok, binary()} | {error, _Reason}}.
read(Transport, Len) when is_integer(Len) ->
Module = Transport#transport.module,
- {NewTransData, Result} = Module:read(Transport#transport.data, Len),
- {Transport#transport{data = NewTransData}, Result}.
+ Module:read(Transport#transport.data, Len).
--spec flush(#transport{}) -> {#transport{}, ok | {error, _Reason}}.
-flush(Transport = #transport{module = Module, data = Data}) ->
- {NewTransData, Result} = Module:flush(Data),
- {Transport#transport{data = NewTransData}, Result}.
+flush(#transport{module = Module, data = Data}) ->
+ Module:flush(Data).
--spec close(#transport{}) -> {#transport{}, ok | {error, _Reason}}.
-close(Transport = #transport{module = Module, data = Data}) ->
- {NewTransData, Result} = Module:close(Data),
- {Transport#transport{data = NewTransData}, Result}.
+close(#transport{module = Module, data = Data}) ->
+ Module:close(Data).