aboutsummaryrefslogtreecommitdiffstats
path: root/lib/snmp/src/misc/snmp_conf.erl
diff options
context:
space:
mode:
authorHans Bolinder <[email protected]>2019-08-21 09:40:13 +0200
committerHans Bolinder <[email protected]>2019-08-21 09:40:13 +0200
commit504d151a57bc93acb3fb7597214a8e62be9c1cfd (patch)
treef00c1e3bd932dd07dcb7142be1c749e1bb221420 /lib/snmp/src/misc/snmp_conf.erl
parentfc9b69dac7497a250658680eb9e44e6ccf79d0bc (diff)
parentb9aef66da02a8e27b021ad3be2101b221c760a1f (diff)
downloadotp-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_conf.erl')
-rw-r--r--lib/snmp/src/misc/snmp_conf.erl3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/snmp/src/misc/snmp_conf.erl b/lib/snmp/src/misc/snmp_conf.erl
index 20b7af0373..bec9d4d9d9 100644
--- a/lib/snmp/src/misc/snmp_conf.erl
+++ b/lib/snmp/src/misc/snmp_conf.erl
@@ -265,7 +265,8 @@ open_file(File) ->
end.
do_read(Io, Prompt, StartLine) ->
- case io:request(Io, {get_until,Prompt,erl_scan,tokens,[StartLine]}) of
+ Enc = latin1,
+ case io:request(Io, {get_until,Enc,Prompt,erl_scan,tokens,[StartLine]}) of
{ok, Toks, EndLine} ->
case erl_parse:parse_term(Toks) of
{ok, Term} ->