From f034779a3134c2b5ceabc2bfe4834b04cd60f981 Mon Sep 17 00:00:00 2001 From: tromey Date: Fri, 14 Nov 2003 01:48:30 +0000 Subject: * 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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@73571 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/gnu/awt/gtk/natGtkButtonPeer.cc | 2 +- libjava/gnu/awt/gtk/natGtkLabelPeer.cc | 2 +- libjava/gnu/gcj/convert/natIconv.cc | 4 ++-- libjava/gnu/gcj/runtime/natNameFinder.cc | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) (limited to 'libjava/gnu') diff --git a/libjava/gnu/awt/gtk/natGtkButtonPeer.cc b/libjava/gnu/awt/gtk/natGtkButtonPeer.cc index 1608616f25e..bc1c79a0e1f 100644 --- a/libjava/gnu/awt/gtk/natGtkButtonPeer.cc +++ b/libjava/gnu/awt/gtk/natGtkButtonPeer.cc @@ -19,7 +19,7 @@ gnu::awt::gtk::GtkButtonPeer::setLabel (java::lang::String *label) // FIXME: this can allocate an unbounded amount. Should use heap // even though it is slower. if (label) - JvGetStringUTFRegion (label, 0, len, buf); + JvGetStringUTFRegion (label, 0, label->length(), buf); buf[len] = '\0'; // The button child is a label. GtkBin *bin = GTK_BIN (ptr); diff --git a/libjava/gnu/awt/gtk/natGtkLabelPeer.cc b/libjava/gnu/awt/gtk/natGtkLabelPeer.cc index 95fc7f63d17..d4195d9d1b1 100644 --- a/libjava/gnu/awt/gtk/natGtkLabelPeer.cc +++ b/libjava/gnu/awt/gtk/natGtkLabelPeer.cc @@ -20,7 +20,7 @@ gnu::awt::gtk::GtkLabelPeer::setText (java::lang::String *text) // even though it is slower. char buf[len + 1]; if (text) - JvGetStringUTFRegion (text, 0, len, buf); + JvGetStringUTFRegion (text, 0, text->length(), buf); buf[len] = '\0'; gtk_label_set_text (GTK_LABEL (ptr), buf); } diff --git a/libjava/gnu/gcj/convert/natIconv.cc b/libjava/gnu/gcj/convert/natIconv.cc index d98e449677a..6c64e2b4bf9 100644 --- a/libjava/gnu/gcj/convert/natIconv.cc +++ b/libjava/gnu/gcj/convert/natIconv.cc @@ -42,7 +42,7 @@ gnu::gcj::convert::Input_iconv::init (jstring encoding) #ifdef HAVE_ICONV jsize len = _Jv_GetStringUTFLength (encoding); char buffer[len + 1]; - _Jv_GetStringUTFRegion (encoding, 0, len, buffer); + _Jv_GetStringUTFRegion (encoding, 0, encoding->length(), buffer); buffer[len] = '\0'; iconv_t h = iconv_open ("UCS-2", buffer); @@ -142,7 +142,7 @@ gnu::gcj::convert::Output_iconv::init (jstring encoding) #ifdef HAVE_ICONV jsize len = _Jv_GetStringUTFLength (encoding); char buffer[len + 1]; - _Jv_GetStringUTFRegion (encoding, 0, len, buffer); + _Jv_GetStringUTFRegion (encoding, 0, encoding->length(), buffer); buffer[len] = '\0'; iconv_t h = iconv_open (buffer, "UCS-2"); diff --git a/libjava/gnu/gcj/runtime/natNameFinder.cc b/libjava/gnu/gcj/runtime/natNameFinder.cc index 6605e380591..41b8f4badf2 100644 --- a/libjava/gnu/gcj/runtime/natNameFinder.cc +++ b/libjava/gnu/gcj/runtime/natNameFinder.cc @@ -1,6 +1,6 @@ // natNameFinder.cc - native helper methods for NameFinder.java -/* Copyright (C) 2002 Free Software Foundation, Inc +/* Copyright (C) 2002, 2003 Free Software Foundation, Inc This file is part of libgcj. @@ -56,7 +56,7 @@ gnu::gcj::runtime::NameFinder::getExternalLabel (java::lang::String* name) char *newName = (char *) JvMalloc (pfxLen + nameLen + 1); *(newName + 0) = '\0'; strcpy (newName, LABEL_PREFIX); - JvGetStringUTFRegion (name, 0, nameLen, newName + pfxLen); + JvGetStringUTFRegion (name, 0, name->length(), newName + pfxLen); *(newName + pfxLen + nameLen) = '\0'; return JvNewStringLatin1 (newName); } -- cgit v1.2.3