* src/vm/string.c (javastring_print): Renamed to javastring_fprint and

added a stream argument.
* src/vm/stringlocal.h: Likewise.

diff --git a/src/vm/string.c b/src/vm/string.c
index 2d215c15c1cb18099ee6759ffb1a823303413b3a..7ba009af5ff5240f9b715f8c209fe8c941d3a0a4 100644 (file)
--- a/src/vm/string.c
+++ b/src/vm/string.c
@@ -27,6 +27,8 @@
 
 #include <assert.h>
 
+#include "vmcore/system.h"
+
 #include "vm/types.h"
 
 #include "vm/global.h"
@@ -759,13 +761,13 @@ java_handle_t *javastring_intern(java_handle_t *s)
 }
 
 
-/* javastring_print ************************************************************
+/* javastring_fprint ***********************************************************
 
-   Print the given Java string.
+   Print the given Java string to the given stream.
 
 *******************************************************************************/
 
-void javastring_print(java_handle_t *s)
+void javastring_fprint(java_handle_t *s, FILE *stream)
 {
        java_lang_String        *so;
        java_handle_chararray_t *value;
@@ -782,7 +784,7 @@ void javastring_print(java_handle_t *s)
 
        for (i = offset; i < offset + count; i++) {
                c = LLNI_array_direct(value, i);
-               putchar(c);
+               fputc(c, stream);
        }
 }
 

diff --git a/src/vm/stringlocal.h b/src/vm/stringlocal.h
index 1aa4579e5024f4f4e1e0e5021036ac256304533b..74ffc2366b44bb0cb93c23e433569aed3b861af7 100644 (file)
--- a/src/vm/stringlocal.h
+++ b/src/vm/stringlocal.h
@@ -1,9 +1,7 @@
 /* src/vm/stringlocal.h - string header
 
-   Copyright (C) 1996-2005, 2006, 2007 R. Grafl, A. Krall, C. Kruegel,
-   C. Oates, R. Obermaisser, M. Platter, M. Probst, S. Ring,
-   E. Steiner, C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich,
-   J. Wenninger, Institut f. Computersprachen - TU Wien
+   Copyright (C) 1996-2005, 2006, 2007, 2008
+   CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
 
    This file is part of CACAO.
 
@@ -32,6 +30,9 @@ typedef struct literalstring literalstring;
 
 
 #include "config.h"
+
+#include "vmcore/system.h"
+
 #include "vm/types.h"
 
 #include "toolbox/hashtable.h"
@@ -85,7 +86,7 @@ utf *javastring_toutf(java_handle_t *string, bool isclassname);
 java_object_t *literalstring_new(utf *u);
 
 java_handle_t *javastring_intern(java_handle_t *s);
-void           javastring_print(java_handle_t *s);
+void           javastring_fprint(java_handle_t *s, FILE *stream);
 
 #endif /* _STRINGLOCAL_H */