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/snmp/src/misc/snmp_config.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/snmp/src/misc/snmp_config.erl')
-rw-r--r-- | lib/snmp/src/misc/snmp_config.erl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/snmp/src/misc/snmp_config.erl b/lib/snmp/src/misc/snmp_config.erl index 3104f2a096..5aab9a74e0 100644 --- a/lib/snmp/src/misc/snmp_config.erl +++ b/lib/snmp/src/misc/snmp_config.erl @@ -2737,7 +2737,8 @@ read_lines(Fd, Acc, StartLine) -> end. read_and_parse_term(Fd, StartLine) -> - case io:request(Fd, {get_until, "", erl_scan, tokens, [StartLine]}) of + Enc = latin1, + case io:request(Fd, {get_until, Enc, "", erl_scan, tokens, [StartLine]}) of {ok, Tokens, EndLine} -> case erl_parse:parse_term(Tokens) of {ok, Term} -> |