Merge branch 'hans/ssh/send_iolist/OTP-16373' into maint-20

* hans/ssh/send_iolist/OTP-16373:
  ssh: Change ssh_connection:send to take iodata()

2 files changed, 8 insertions, 23 deletions

diff --git a/lib/ssh/doc/src/ssh_connection.xml b/lib/ssh/doc/src/ssh_connection.xml
index 150d46a9a2..f9ba5c5af9 100644
--- a/lib/ssh/doc/src/ssh_connection.xml
+++ b/lib/ssh/doc/src/ssh_connection.xml
@@ -366,7 +366,7 @@
        <type>
 	<v>ConnectionRef = ssh_connection_ref()</v>
 	<v>ChannelId = ssh_channel_id()</v>
-	<v>Data = binary()</v>
+	<v>Data = iodata()</v>
 	<v>Type = ssh_data_type_code()</v>
 	<v>Timeout = timeout()</v>
        </type>
diff --git a/lib/ssh/src/ssh_connection.erl b/lib/ssh/src/ssh_connection.erl
index 946ae2967b..6ce3223780 100644
--- a/lib/ssh/src/ssh_connection.erl
+++ b/lib/ssh/src/ssh_connection.erl
@@ -234,32 +234,17 @@ exit_status(ConnectionHandler, Channel, Status) ->
 %%--------------------------------------------------------------------
 %%% Internal API
 %%--------------------------------------------------------------------
-l2b(L) when is_integer(hd(L)) ->
-    try list_to_binary(L)
-    of
-	B -> B
-    catch
-	_:_ -> 
-	    unicode:characters_to_binary(L)
-    end;
-l2b([H|T]) -> 
-    << (l2b(H))/binary, (l2b(T))/binary >>;
-l2b(B) when is_binary(B) ->
-    B;
-l2b([]) ->
-    <<>>.
-
-    
-
-channel_data(ChannelId, DataType, Data, Connection, From)
-  when is_list(Data)->
-    channel_data(ChannelId, DataType, l2b(Data), Connection, From);
-
-channel_data(ChannelId, DataType, Data, 
+channel_data(ChannelId, DataType, Data0, 
 	     #connection{channel_cache = Cache} = Connection,
 	     From) ->
     case ssh_channel:cache_lookup(Cache, ChannelId) of
 	#channel{remote_id = Id, sent_close = false} = Channel0 ->
+            Data =
+               try iolist_to_binary(Data0)
+               catch
+                   _:_ -> 
+                       unicode:characters_to_binary(Data0)
+               end,
 	    {SendList, Channel} =
 		update_send_window(Channel0#channel{flow_control = From}, DataType,
 				   Data, Connection),