diff options
| author | Hans Bolinder <[email protected]> | 2019-08-21 09:40:13 +0200 |
|---|---|---|
| committer | Hans Bolinder <[email protected]> | 2019-08-21 09:40:13 +0200 |
| commit | 504d151a57bc93acb3fb7597214a8e62be9c1cfd (patch) | |
| tree | f00c1e3bd932dd07dcb7142be1c749e1bb221420 /lib/sasl/src/systools_lib.erl | |
| parent | fc9b69dac7497a250658680eb9e44e6ccf79d0bc (diff) | |
| parent | b9aef66da02a8e27b021ad3be2101b221c760a1f (diff) | |
| download | otp-504d151a57bc93acb3fb7597214a8e62be9c1cfd.tar.gz otp-504d151a57bc93acb3fb7597214a8e62be9c1cfd.tar.bz2 otp-504d151a57bc93acb3fb7597214a8e62be9c1cfd.zip | |
Merge branch 'hasse/remove_old_IO_requests/OTP-15695'
* hasse/remove_old_IO_requests/OTP-15695:
stdlib: Remove old I/O-requests from test suites
stdlib (doc): Do not mention old requests
snmp: Update old format I/O-request
sasl: Use encoding when reading terms
parsetools (doc): Update old format I/O-requests
mnesia: Update old format I/O-request
kernel: Update old format I/O-requests
stdlib: Remove no longer used function
kernel: Remove commented out code
stdlib: Remove commented out code
Diffstat (limited to 'lib/sasl/src/systools_lib.erl')
| -rw-r--r-- | lib/sasl/src/systools_lib.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/sasl/src/systools_lib.erl b/lib/sasl/src/systools_lib.erl index dd97aeff08..f5489e7900 100644 --- a/lib/sasl/src/systools_lib.erl +++ b/lib/sasl/src/systools_lib.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1996-2016. All Rights Reserved. +%% Copyright Ericsson AB 1996-2019. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -63,8 +63,8 @@ read_term(File) -> end. read_term_from_stream(Stream, File) -> - _ = epp:set_encoding(Stream), - R = io:request(Stream, {get_until,'',erl_scan,tokens,[1]}), + Encoding = epp:set_encoding(Stream), + R = io:request(Stream, {get_until,Encoding,'',erl_scan,tokens,[1]}), case R of {ok,Toks,_EndLine} -> case erl_parse:parse_term(Toks) of |