Mercurial > hg > icedtea7-forest-aarch64 > jdk
changeset 8190:1dca7b2b663b
PR2060: Fix warnings found by Gentoo ebuild QA with gcc 4.9.1
| author | andrew |
|---|---|
| date | Thu, 30 Oct 2014 22:54:21 +0000 |
| parents | 92b0accc065b |
| children | 33a33bbea1ae |
| files | src/share/native/com/sun/java/util/jar/pack/jni.cpp src/solaris/native/sun/awt/awt_Font.c src/solaris/native/sun/awt/awt_GTKToolkit.c src/solaris/native/sun/awt/awt_GraphicsEnv.h src/solaris/native/sun/awt/awt_UNIXToolkit.c src/solaris/native/sun/awt/fontpath.c |
| diffstat | 6 files changed, 8 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/native/com/sun/java/util/jar/pack/jni.cpp Tue Feb 26 11:12:40 2013 -0800 +++ b/src/share/native/com/sun/java/util/jar/pack/jni.cpp Thu Oct 30 22:54:21 2014 +0000 @@ -244,7 +244,7 @@ if (uPtr->aborting()) { THROW_IOE(uPtr->get_abort_message()); - return false; + return JNI_FALSE; } CHECK_NULL_RETURN(filep, false); @@ -292,7 +292,7 @@ if (uPtr->aborting()) { THROW_IOE(uPtr->get_abort_message()); - return false; + return NULL; } // We have fetched all the files. @@ -310,7 +310,7 @@ JNIEXPORT jlong JNICALL Java_com_sun_java_util_jar_pack_NativeUnpack_finish(JNIEnv *env, jobject pObj) { unpacker* uPtr = get_unpacker(env, pObj, false); - CHECK_EXCEPTION_RETURN_VALUE(uPtr, NULL); + CHECK_EXCEPTION_RETURN_VALUE(uPtr, -1); size_t consumed = uPtr->input_consumed(); free_unpacker(env, pObj, uPtr); return consumed;
--- a/src/solaris/native/sun/awt/awt_Font.c Tue Feb 26 11:12:40 2013 -0800 +++ b/src/solaris/native/sun/awt/awt_Font.c Thu Oct 30 22:54:21 2014 +0000 @@ -574,7 +574,7 @@ jio_snprintf(fdata->flist[i].xlfd, strlen(nativename) + 10, nativename, size * 10); - if (nativename != NULL && nativename != "") + if (nativename != NULL && *nativename != '\0') JNU_ReleaseStringPlatformChars(env, fontDescriptorName, (const char *) nativename); /*
--- a/src/solaris/native/sun/awt/awt_GTKToolkit.c Tue Feb 26 11:12:40 2013 -0800 +++ b/src/solaris/native/sun/awt/awt_GTKToolkit.c Thu Oct 30 22:54:21 2014 +0000 @@ -27,6 +27,7 @@ #include <unistd.h> #include <jni.h> +#include <jni_util.h> #include <sizecalc.h> #include "sun_awt_UNIXToolkit.h"
--- a/src/solaris/native/sun/awt/awt_GraphicsEnv.h Tue Feb 26 11:12:40 2013 -0800 +++ b/src/solaris/native/sun/awt/awt_GraphicsEnv.h Thu Oct 30 22:54:21 2014 +0000 @@ -53,6 +53,7 @@ extern int XShmQueryExtension(); void TryInitMITShm(JNIEnv *env, jint *shmExt, jint *shmPixmaps); +void resetXShmAttachFailed(); jboolean TryXShmAttach(JNIEnv *env, Display *display, XShmSegmentInfo *shminfo); #endif /* MITSHM */
--- a/src/solaris/native/sun/awt/awt_UNIXToolkit.c Tue Feb 26 11:12:40 2013 -0800 +++ b/src/solaris/native/sun/awt/awt_UNIXToolkit.c Thu Oct 30 22:54:21 2014 +0000 @@ -31,6 +31,7 @@ #ifndef HEADLESS #include "awt.h" +#include "gtk2_interface_check.h" #endif /* !HEADLESS */ /*
--- a/src/solaris/native/sun/awt/fontpath.c Tue Feb 26 11:12:40 2013 -0800 +++ b/src/solaris/native/sun/awt/fontpath.c Thu Oct 30 22:54:21 2014 +0000 @@ -764,7 +764,7 @@ Java_sun_font_FontConfigManager_getFontConfigVersion (JNIEnv *env, jclass obj) { - void* libfontconfig; + void* libfontconfig = NULL; int version = 0; #ifndef USE_SYSTEM_FONTCONFIG