2003-12-02 Thomas Fitzsimmons <fitzsim@redhat.com>

	* jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontMetrics.c
	(initState): Mark obj parameter as unused.
	(stringWidth): Mark obj parameter as unused.  Initialize
	font_name properly.

From-SVN: r74198

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 7bb814efc7161c18f52387718b0c051679c1a89c..0d2a3c22667c9c087c2aea679e33122cdcbe306a 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,5 +1,10 @@
 2003-12-02  Thomas Fitzsimmons  <fitzsim@redhat.com>
 
+       * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontMetrics.c
+       (initState): Mark obj parameter as unused.
+       (stringWidth): Mark obj parameter as unused.  Initialize
+       font_name properly.
+
        * gnu/java/awt/peer/gtk/GdkPixbufDecoder.java: Make
        BufferedImageBuilder class static.
 

diff --git a/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontMetrics.c b/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontMetrics.c
index b7cef69f5aa1f42d531bd63998ccb265087a1fff..6036db7c7762b07e2dc3c372dd66d9a718f1dd63 100644 (file)
--- a/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontMetrics.c
+++ b/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontMetrics.c
@@ -47,7 +47,7 @@ exception statement from your version. */
 #define NUM_METRICS 5
 
 JNIEXPORT jintArray JNICALL Java_gnu_java_awt_peer_gtk_GdkFontMetrics_initState
-  (JNIEnv *env, jobject obj, jstring fname, jint size)
+  (JNIEnv *env, jobject obj __attribute__((unused)), jstring fname, jint size)
 {
   jintArray array;
   jint *metrics;
@@ -93,7 +93,8 @@ JNIEXPORT jintArray JNICALL Java_gnu_java_awt_peer_gtk_GdkFontMetrics_initState
 }
 
 JNIEXPORT jint JNICALL Java_gnu_java_awt_peer_gtk_GdkFontMetrics_stringWidth
-  (JNIEnv *env, jobject obj, jstring fname, jint size, jstring str)
+  (JNIEnv *env, jobject obj __attribute__((unused)),
+   jstring fname, jint size, jstring str)
 {
   PangoFontDescription *font_desc;
   PangoContext *context;
@@ -103,6 +104,7 @@ JNIEXPORT jint JNICALL Java_gnu_java_awt_peer_gtk_GdkFontMetrics_stringWidth
   const char *font_name;
 
   cstr = (*env)->GetStringUTFChars (env, str, NULL);
+  font_name = (*env)->GetStringUTFChars (env, fname, NULL);
 
   gdk_threads_enter ();
 
@@ -121,6 +123,7 @@ JNIEXPORT jint JNICALL Java_gnu_java_awt_peer_gtk_GdkFontMetrics_stringWidth
 
   gdk_threads_leave ();
 
+  (*env)->ReleaseStringUTFChars (env, fname, font_name);
   (*env)->ReleaseStringUTFChars (env, str, cstr);
 
   return width;