aboutsummaryrefslogtreecommitdiff
path: root/libjava/java
diff options
context:
space:
mode:
authorTom Tromey <tromey@redhat.com>2003-11-14 01:48:30 +0000
committerTom Tromey <tromey@gcc.gnu.org>2003-11-14 01:48:30 +0000
commitb86ca9a2dc1a1a359189d3ecf01c8757afa6e993 (patch)
tree9f26991ca04f62953865bb7d4a57ff02205aacae /libjava/java
parenta25d596a2961075d0aa21c51c822d87218610718 (diff)
downloadgcc-b86ca9a2dc1a1a359189d3ecf01c8757afa6e993.zip
gcc-b86ca9a2dc1a1a359189d3ecf01c8757afa6e993.tar.gz
gcc-b86ca9a2dc1a1a359189d3ecf01c8757afa6e993.tar.bz2
jni.cc (_Jv_JNI_GetStringUTFChars): Pass length of string to JvGetStringUTFRegion.
* jni.cc (_Jv_JNI_GetStringUTFChars): Pass length of string to JvGetStringUTFRegion. * java/lang/natPosixProcess.cc (new_string): Pass length of string to JvGetStringUTFRegion. * java/lang/natDouble.cc (parseDouble): Pass length of string to JvGetStringUTFRegion. * java/lang/natWin32Process.cc (startProcess): Pass length of string to JvGetStringUTFRegion. * java/lang/natClass.cc (forName): Pass length of string to JvGetStringUTFRegion. * gnu/gcj/runtime/natNameFinder.cc (getExternalLabel): Pass length of string to JvGetStringUTFRegion. * gnu/gcj/convert/natIconv.cc (init): Pass length of string to JvGetStringUTFRegion. * gnu/awt/gtk/natGtkLabelPeer.cc (setText): Pass length of string to JvGetStringUTFRegion. * gnu/awt/gtk/natGtkButtonPeer.cc (setLabel): Pass length of string to JvGetStringUTFRegion. From-SVN: r73571
Diffstat (limited to 'libjava/java')
-rw-r--r--libjava/java/lang/natClass.cc2
-rw-r--r--libjava/java/lang/natDouble.cc4
-rw-r--r--libjava/java/lang/natPosixProcess.cc4
-rw-r--r--libjava/java/lang/natWin32Process.cc4
4 files changed, 7 insertions, 7 deletions
diff --git a/libjava/java/lang/natClass.cc b/libjava/java/lang/natClass.cc
index f7793a56..21393f4 100644
--- a/libjava/java/lang/natClass.cc
+++ b/libjava/java/lang/natClass.cc
@@ -71,7 +71,7 @@ java::lang::Class::forName (jstring className, jboolean initialize,
jsize length = _Jv_GetStringUTFLength (className);
char buffer[length];
- _Jv_GetStringUTFRegion (className, 0, length, buffer);
+ _Jv_GetStringUTFRegion (className, 0, className->length(), buffer);
_Jv_Utf8Const *name = _Jv_makeUtf8Const (buffer, length);
diff --git a/libjava/java/lang/natDouble.cc b/libjava/java/lang/natDouble.cc
index 329795d..4c96930 100644
--- a/libjava/java/lang/natDouble.cc
+++ b/libjava/java/lang/natDouble.cc
@@ -1,6 +1,6 @@
// natDouble.cc - Implementation of java.lang.Double native methods.
-/* Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation
+/* Copyright (C) 1998, 1999, 2000, 2001, 2003 Free Software Foundation
This file is part of libgcj.
@@ -183,7 +183,7 @@ java::lang::Double::parseDouble(jstring str)
{
// Note that UTF can expand 3x.
char *data = (char *) __builtin_alloca (3 * length + 1);
- jsize blength = _Jv_GetStringUTFRegion (str, start, length, data);
+ jsize blength = _Jv_GetStringUTFRegion (str, start, str->length(), data);
data[blength] = 0;
struct _Jv_reent reent;
diff --git a/libjava/java/lang/natPosixProcess.cc b/libjava/java/lang/natPosixProcess.cc
index ec3eccb..ef46924 100644
--- a/libjava/java/lang/natPosixProcess.cc
+++ b/libjava/java/lang/natPosixProcess.cc
@@ -1,6 +1,6 @@
// natPosixProcess.cc - Native side of POSIX process code.
-/* Copyright (C) 1998, 1999, 2000, 2002 Free Software Foundation
+/* Copyright (C) 1998, 1999, 2000, 2002, 2003 Free Software Foundation
This file is part of libgcj.
@@ -82,7 +82,7 @@ new_string (jstring string)
{
jsize s = _Jv_GetStringUTFLength (string);
char *buf = (char *) _Jv_Malloc (s + 1);
- _Jv_GetStringUTFRegion (string, 0, s, buf);
+ _Jv_GetStringUTFRegion (string, 0, string->length(), buf);
buf[s] = '\0';
return buf;
}
diff --git a/libjava/java/lang/natWin32Process.cc b/libjava/java/lang/natWin32Process.cc
index b687a0e..56394cf 100644
--- a/libjava/java/lang/natWin32Process.cc
+++ b/libjava/java/lang/natWin32Process.cc
@@ -230,7 +230,7 @@ java::lang::ConcreteProcess::startProcess (jstringArray progarray,
if (i > 0)
*cmdLineCurPos++ = ' ';
jsize s = _Jv_GetStringUTFLength (elts[i]);
- _Jv_GetStringUTFRegion (elts[i], 0, s, cmdLineCurPos);
+ _Jv_GetStringUTFRegion (elts[i], 0, elts[i]->length(), cmdLineCurPos);
cmdLineCurPos += s;
}
*cmdLineCurPos = '\0';
@@ -251,7 +251,7 @@ java::lang::ConcreteProcess::startProcess (jstringArray progarray,
for (int i = 0; i < envp->length; ++i)
{
jsize s = _Jv_GetStringUTFLength (elts[i]);
- _Jv_GetStringUTFRegion (elts[i], 0, s, (env + j));
+ _Jv_GetStringUTFRegion (elts[i], 0, elts[i]->length(), (env + j));
j += s;
*(env + j) = '\0';