UTF-8 support for distribution

1 files changed, 14 insertions, 12 deletions

diff --git a/erts/emulator/beam/bif.c b/erts/emulator/beam/bif.c
index 89157068c0..a0b4a8c049 100644
--- a/erts/emulator/beam/bif.c
+++ b/erts/emulator/beam/bif.c
@@ -2536,11 +2536,13 @@ BIF_RETTYPE append_element_2(BIF_ALIST_2)
 
 BIF_RETTYPE atom_to_list_1(BIF_ALIST_1)
 {
-    Eterm do_utf8_to_list(Process*, Uint num, byte *bytes, Uint sz, Uint left,
-			  Uint *num_built, Uint *num_eaten, Eterm tail); /*SVERK */
     Atom* ap;
     Uint num_chars, num_built, num_eaten;
+    byte* err_pos;
     Eterm res;
+#ifdef DEBUG
+    int ares;
+#endif
 
     if (is_not_atom(BIF_ARG_1))
 	BIF_ERROR(BIF_P, BADARG);
@@ -2549,16 +2551,15 @@ BIF_RETTYPE atom_to_list_1(BIF_ALIST_1)
     ap = atom_tab(atom_val(BIF_ARG_1));
     if (ap->len == 0)
 	BIF_RET(NIL);	/* the empty atom */
-    {
-	byte* err_pos;
-	if (erts_analyze_utf8(ap->name, ap->len, &err_pos, &num_chars, NULL)
-	    != ERTS_UTF8_OK) {
-	    BIF_ERROR(BIF_P, BADARG);
-	}
-    }
+
+#ifdef DEBUG
+    ares =
+#endif
+	erts_analyze_utf8(ap->name, ap->len, &err_pos, &num_chars, NULL);
+    ASSERT(ares == ERTS_UTF8_OK);
     
-    res = do_utf8_to_list(BIF_P, num_chars, ap->name, ap->len, ap->len,
-			  &num_built, &num_eaten, NIL);
+    res = erts_utf8_to_list(BIF_P, num_chars, ap->name, ap->len, ap->len,
+			    &num_built, &num_eaten, NIL);
     ASSERT(num_built == num_chars);
     ASSERT(num_eaten == ap->len);
     BIF_RET(res);
@@ -2582,7 +2583,8 @@ BIF_RETTYPE list_to_atom_1(BIF_ALIST_1)
 	}
 	BIF_ERROR(BIF_P, BADARG);
     }
-    res = am_atom_put2((byte*)buf, i, 1);
+    res = erts_atom_put((byte *) buf, i, ERTS_ATOM_ENC_LATIN1, 1);
+    ASSERT(is_atom(res));
     erts_free(ERTS_ALC_T_TMP, (void *) buf);
     BIF_RET(res);
 }