* src/toolbox/sequence.hpp: Added new file to hold sequence builder class.

[cacao.git] / src / native / vm / openjdk / hpi.cpp

diff --git a/src/native/vm/openjdk/hpi.cpp b/src/native/vm/openjdk/hpi.cpp
index 7c7527897a487dffbae493c7ffc441f5441f43d1..1bb2d52d0b07fa31c963a9c2106146f4bb318192 100644 (file)
--- a/src/native/vm/openjdk/hpi.cpp
+++ b/src/native/vm/openjdk/hpi.cpp
@@ -32,6 +32,8 @@
 
 #include "native/native.hpp"
 
+#include "toolbox/sequence.hpp"
+
 #include "vm/options.h"
 #include "vm/os.hpp"
 #include "vm/properties.hpp"
@@ -72,22 +74,17 @@ void HPI::initialize() // REMOVEME
        Properties& properties = vm->get_properties();
        const char* boot_library_path = properties.get("sun.boot.library.path");
 
-       size_t len =
-               os::strlen(boot_library_path) +
-               os::strlen("/native_threads/libhpi.so") +
-               os::strlen("0");
-
-       char* p = MNEW(char, len);
+       // Use sequence builder to assemble library path.
+       SequenceBuilder sb;
 
-       os::strcpy(p, boot_library_path);
-       os::strcat(p, "/native_threads/libhpi.so");
+       sb.cat(boot_library_path);
+       sb.cat("/native_threads/libhpi.so");
 
-       utf* u = utf_new_char(p);
+       // XXX This should actually be sb.export_symbol()
+       utf* u = utf_new_char(sb.c_str());
 
     if (opt_TraceHPI)
-               log_println("HPI::initialize: Loading HPI %s ", p);
-
-       MFREE(p, char, len);
+               log_println("HPI::initialize: Loading HPI %s ", sb.c_str());
 
        NativeLibrary nl(u);
        void* handle = nl.open();