* src/vm/loader.c (load_class_from_classbuffer): Use new

utf_ functions.

diff --git a/src/vm/loader.c b/src/vm/loader.c
index 71dec93cd3e72067f8bd0da4a0c682462c3ac700..f114b6e2882347032644b4ac3202627ceb0410a7 100644 (file)
--- a/src/vm/loader.c
+++ b/src/vm/loader.c
@@ -32,7 +32,7 @@
             Edwin Steiner
             Christian Thalinger
 
-   $Id: loader.c 4879 2006-05-05 17:34:49Z edwin $
+   $Id: loader.c 4881 2006-05-05 18:14:27Z edwin $
 
 */
 
@@ -1924,14 +1924,14 @@ classinfo *load_class_from_classbuffer(classbuffer *cb)
                char *msg;
                s4    msglen;
 
-               msglen = utf_get_number_of_u2s(c->name) + strlen(" (wrong name: ") +
-                       utf_get_number_of_u2s(name) + strlen(")") + strlen("0");
+               msglen = utf_bytes(c->name) + strlen(" (wrong name: ") +
+                       utf_bytes(name) + strlen(")") + strlen("0");
 
                msg = MNEW(char, msglen);
 
-               utf_sprint_convert_to_latin1(msg, c->name);
+               utf_copy_classname(msg, c->name);
                strcat(msg, " (wrong name: ");
-               utf_strcat_convert_to_latin1(msg, name);
+               utf_cat_classname(msg, name);
                strcat(msg, ")");
 
                *exceptionptr =