aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam/erl_unicode.c
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2013-01-24 19:22:59 +0100
committerSverker Eriksson <[email protected]>2013-01-25 15:37:22 +0100
commit120d84e2eb38a98ff2c187c27ac53b49cc9e863a (patch)
tree5011e7c314a4208a7ab35e310f06c4e1b23ef589 /erts/emulator/beam/erl_unicode.c
parentbe062ca7528b3267a6ef08653b001913fc12ae8e (diff)
downloadotp-120d84e2eb38a98ff2c187c27ac53b49cc9e863a.tar.gz
otp-120d84e2eb38a98ff2c187c27ac53b49cc9e863a.tar.bz2
otp-120d84e2eb38a98ff2c187c27ac53b49cc9e863a.zip
erts: Refactor erts_atom_get to use ErtsAtomEncoding
instead of 'is_latin1' boolean argument.
Diffstat (limited to 'erts/emulator/beam/erl_unicode.c')
-rw-r--r--erts/emulator/beam/erl_unicode.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/beam/erl_unicode.c b/erts/emulator/beam/erl_unicode.c
index 883405d066..0d4d0f40b6 100644
--- a/erts/emulator/beam/erl_unicode.c
+++ b/erts/emulator/beam/erl_unicode.c
@@ -1905,7 +1905,7 @@ binary_to_atom(Process* proc, Eterm bin, Eterm enc, int must_exist)
if (is_non_value(a))
goto badarg;
BIF_RET(a);
- } else if (erts_atom_get((char *)bytes, bin_size, &a, 1)) {
+ } else if (erts_atom_get((char *)bytes, bin_size, &a, ERTS_ATOM_ENC_LATIN1)) {
erts_free_aligned_binary_bytes(temp_alloc);
BIF_RET(a);
} else {
@@ -1940,7 +1940,7 @@ binary_to_atom(Process* proc, Eterm bin, Eterm enc, int must_exist)
ERTS_ATOM_ENC_UTF8,
0);
}
- else if (!erts_atom_get((char*)bytes, bin_size, &res, 0)) {
+ else if (!erts_atom_get((char*)bytes, bin_size, &res, ERTS_ATOM_ENC_UTF8)) {
goto badarg;
}
erts_free_aligned_binary_bytes(temp_alloc);