File openjdk-6-src-b09-gcc4-warningfixes.patch of Package java-1_6_0-openjdk
--- openjdk/jdk/src/solaris/native/sun/awt/awt_Font.c 2008/02/05
+++ openjdk/jdk/src/solaris/native/sun/awt/awt_Font.c 2008/02/05
@@ -566,23 +566,23 @@
if (!JNU_IsNull(env, fontDescriptorName)) {
nativename = (char *) JNU_GetStringPlatformChars(env, fontDescriptorName, NULL);
} else {
nativename = "";
}
fdata->flist[i].xlfd = malloc(strlen(nativename)
+ strlen(defaultXLFD));
jio_snprintf(fdata->flist[i].xlfd, strlen(nativename) + 10,
nativename, size * 10);
- if (nativename != NULL && nativename != "")
+ if (*nativename)
JNU_ReleaseStringPlatformChars(env, fontDescriptorName, (const char *) nativename);
/*
* set charset_name
*/
charsetName =
(*env)->GetObjectField(env, fontDescriptor,
fontDescriptorIDs.charsetName);
fdata->flist[i].charset_name = (char *)
--- openjdk/jdk/src/solaris/bin/jexec.c 2008/05/09 07:38:55 1.1
+++ openjdk/jdk/src/solaris/bin/jexec.c 2008/05/09 07:40:14
@@ -221,6 +221,7 @@
* implies an error in the exec. */
free(nargv);
errorExit(errno, BAD_EXEC_MSG);
+ return 0; // make gcc happy
}