--- old/make/lib/Awt2dLibraries.gmk 2018-11-26 16:07:27.645125181 +0530 +++ new/make/lib/Awt2dLibraries.gmk 2018-11-26 16:07:27.377259181 +0530 @@ -208,11 +208,7 @@ LIBAWT_CFLAGS += $(EXPORT_ALL_SYMBOLS) endif -# Turn off all warnings for debug_mem.c This is needed because the specific warning -# about initializing a declared 'extern' cannot be turned off individually. Only -# applies to debug builds. ifeq ($(TOOLCHAIN_TYPE), gcc) - BUILD_LIBAWT_debug_mem.c_CFLAGS := -w # This option improves performance of MaskFill in Java2D by 20% for some gcc LIBAWT_CFLAGS += -fgcse-after-reload endif @@ -225,8 +221,7 @@ OPTIMIZATION := LOW, \ CFLAGS := $(CFLAGS_JDKLIB) $(LIBAWT_CFLAGS), \ EXTRA_HEADER_DIRS := $(LIBAWT_EXTRA_HEADER_DIRS), \ - DISABLED_WARNINGS_gcc := sign-compare unused-result maybe-uninitialized \ - format-nonliteral parentheses unused-value unused-function, \ + DISABLED_WARNINGS_gcc := unused-value unused-function, \ DISABLED_WARNINGS_clang := logical-op-parentheses extern-initializer \ sign-compare format-nonliteral, \ DISABLED_WARNINGS_solstudio := E_DECLARATION_IN_CODE, \ @@ -313,17 +308,6 @@ LIBAWT_XAWT_LIBS += -lpthread endif - ifeq ($(TOOLCHAIN_TYPE), gcc) - # Turn off all warnings for the following files since they contain warnings - # that cannot be turned of individually. - # redefining a macro - BUILD_LIBAWT_XAWT_gtk2_interface.c_CFLAGS := -w - # comparison between pointer and integer - BUILD_LIBAWT_XAWT_awt_Font.c_CFLAGS := -w - # initializing a declared 'extern' - BUILD_LIBAWT_XAWT_debug_mem.c_CFLAGS := -w - endif - $(eval $(call SetupJdkLibrary, BUILD_LIBAWT_XAWT, \ NAME := awt_xawt, \ EXTRA_SRC := $(LIBAWT_XAWT_EXTRA_SRC), \ @@ -333,10 +317,7 @@ CFLAGS := $(CFLAGS_JDKLIB) $(LIBAWT_XAWT_CFLAGS) \ $(X_CFLAGS), \ WARNINGS_AS_ERRORS_xlc := false, \ - DISABLED_WARNINGS_gcc := type-limits pointer-to-int-cast \ - unused-result maybe-uninitialized format \ - format-security int-to-pointer-cast parentheses \ - implicit-fallthrough undef unused-function, \ + DISABLED_WARNINGS_gcc := format unused-function, \ DISABLED_WARNINGS_clang := parentheses format undef \ logical-op-parentheses format-nonliteral int-conversion, \ DISABLED_WARNINGS_solstudio := E_DECLARATION_IN_CODE \ --- old/src/java.desktop/share/native/common/awt/debug/debug_mem.c 2018-11-26 16:07:28.224835182 +0530 +++ new/src/java.desktop/share/native/common/awt/debug/debug_mem.c 2018-11-26 16:07:27.956969181 +0530 @@ -74,7 +74,8 @@ * Global Data structures */ static DMemState DMemGlobalState; -extern const DMemState * DMemStatePtr = &DMemGlobalState; +extern const DMemState * DMemStatePtr; +const DMemState* DMemStatePtr = &DMemGlobalState; //initialize separately to keep GCC happy static MemoryListLink MemoryList = {NULL,NULL,FALSE}; static dmutex_t DMemMutex = NULL; @@ -275,15 +276,14 @@ } static void DMem_DumpHeader(MemoryBlockHeader * header) { - char report[FILENAME_MAX+MAX_DECIMAL_DIGITS*3+1]; - static const char * reportFormat = - "file: %s, line %d\n" - "size: %d bytes\n" - "order: %d\n" - "-------"; + char report[FILENAME_MAX+MAX_DECIMAL_DIGITS*3+1+8]; DMem_VerifyHeader(header); - sprintf(report, reportFormat, header->filename, header->linenumber, header->size, header->order); + sprintf(report, "file: %s, line %d\n"\ + "size: %d bytes\n"\ + "order: %d\n"\ + "-------", + header->filename, (int)header->linenumber, (int)header->size, header->order); DTRACE_PRINTLN(report); } --- old/src/java.desktop/share/native/libawt/awt/image/awt_parseImage.c 2018-11-26 16:07:28.740577181 +0530 +++ new/src/java.desktop/share/native/libawt/awt/image/awt_parseImage.c 2018-11-26 16:07:28.476709181 +0530 @@ -319,7 +319,7 @@ rasterP->jdata = (*env)->GetObjectField(env, jraster, g_BPRdataID); rasterP->type = (*env)->GetIntField(env, jraster, g_BPRtypeID); rasterP->chanOffsets = NULL; - if (SAFE_TO_ALLOC_2(rasterP->numDataElements, sizeof(jint))) { + if (SAFE_TO_ALLOC_2(rasterP->numDataElements, (int)sizeof(jint))) { rasterP->chanOffsets = (jint *)malloc(rasterP->numDataElements * sizeof(jint)); } @@ -354,7 +354,7 @@ case BANDED_RASTER_TYPE: // note that this routine does not support banded rasters at the moment // get channel (data) offsets rasterP->chanOffsets = NULL; - if (SAFE_TO_ALLOC_2(rasterP->numDataElements, sizeof(jint))) { + if (SAFE_TO_ALLOC_2(rasterP->numDataElements, (int)sizeof(jint))) { rasterP->chanOffsets = (jint *)malloc(rasterP->numDataElements * sizeof(jint)); } @@ -486,7 +486,7 @@ } cmP->nBits = NULL; - if (SAFE_TO_ALLOC_2(cmP->numComponents, sizeof(jint))) { + if (SAFE_TO_ALLOC_2(cmP->numComponents, (int)sizeof(jint))) { cmP->nBits = (jint *)malloc(cmP->numComponents * sizeof(jint)); } @@ -701,7 +701,7 @@ hintP->numChans = imageP->cmodel.numComponents; hintP->colorOrder = NULL; - if (SAFE_TO_ALLOC_2(hintP->numChans, sizeof(int))) { + if (SAFE_TO_ALLOC_2(hintP->numChans, (int)sizeof(int))) { hintP->colorOrder = (int *)malloc(hintP->numChans * sizeof(int)); } if (hintP->colorOrder == NULL) { --- old/src/java.desktop/share/native/libawt/awt/medialib/awt_ImagingLib.c 2018-11-26 16:07:29.280307180 +0530 +++ new/src/java.desktop/share/native/libawt/awt/medialib/awt_ImagingLib.c 2018-11-26 16:07:29.012441181 +0530 @@ -333,7 +333,7 @@ } dkern = NULL; - if (SAFE_TO_ALLOC_3(w, h, sizeof(mlib_d64))) { + if (SAFE_TO_ALLOC_3(w, h, (int)sizeof(mlib_d64))) { dkern = (mlib_d64 *)calloc(1, w * h * sizeof(mlib_d64)); } if (dkern == NULL) { @@ -416,7 +416,7 @@ } kdata = NULL; - if (SAFE_TO_ALLOC_3(w, h, sizeof(mlib_s32))) { + if (SAFE_TO_ALLOC_3(w, h, (int)sizeof(mlib_s32))) { kdata = (mlib_s32 *)malloc(w * h * sizeof(mlib_s32)); } if (kdata == NULL) { @@ -574,7 +574,7 @@ } dkern = NULL; - if (SAFE_TO_ALLOC_3(w, h, sizeof(mlib_d64))) { + if (SAFE_TO_ALLOC_3(w, h, (int)sizeof(mlib_d64))) { dkern = (mlib_d64 *)calloc(1, w * h * sizeof(mlib_d64)); } if (dkern == NULL) { @@ -662,7 +662,7 @@ } kdata = NULL; - if (SAFE_TO_ALLOC_3(w, h, sizeof(mlib_s32))) { + if (SAFE_TO_ALLOC_3(w, h, (int)sizeof(mlib_s32))) { kdata = (mlib_s32 *)malloc(w * h * sizeof(mlib_s32)); } if (kdata == NULL) { @@ -1375,13 +1375,13 @@ } tbl = NULL; - if (SAFE_TO_ALLOC_2(ncomponents, sizeof(unsigned char *))) { + if (SAFE_TO_ALLOC_2(ncomponents, (int)sizeof(unsigned char *))) { tbl = (unsigned char **) calloc(1, ncomponents * sizeof(unsigned char *)); } jtable = NULL; - if (SAFE_TO_ALLOC_2(lut_nbands, sizeof(LookupArrayInfo))) { + if (SAFE_TO_ALLOC_2(lut_nbands, (int)sizeof(LookupArrayInfo))) { jtable = (LookupArrayInfo *)malloc(lut_nbands * sizeof (LookupArrayInfo)); } --- old/src/java.desktop/share/native/libawt/java2d/loops/ProcessPath.c 2018-11-26 16:07:29.844025181 +0530 +++ new/src/java.desktop/share/native/libawt/java2d/loops/ProcessPath.c 2018-11-26 16:07:29.572161181 +0530 @@ -784,10 +784,10 @@ * and Y points. The values are inside the (0,1) range (0 and 1 excluded) * and in ascending order. */ - double params[2]; + double params[2] = {0.0, 0.0}; jint cnt = 0; - double param; + double param = 0.0; /* Simple check for monotonicity in X before searching for the extreme * points of the X(t) function. We first check if the curve is monotonic --- old/src/java.desktop/share/native/libawt/java2d/loops/TransformHelper.c 2018-11-26 16:07:30.415739181 +0530 +++ new/src/java.desktop/share/native/libawt/java2d/loops/TransformHelper.c 2018-11-26 16:07:30.135879180 +0530 @@ -407,7 +407,7 @@ /* numedges variable (jlong) can be at most ((1<<32)-1) */ /* memsize can overflow a jint, but not a jlong */ jlong memsize = ((numedges * 2) + 2) * sizeof(*pEdges); - pEdges = (memsize == ((size_t) memsize)) + pEdges = (memsize > 0) ? malloc((size_t) memsize) : NULL; } else { --- old/src/java.desktop/unix/native/common/awt/awt_Font.c 2018-11-26 16:07:30.983455181 +0530 +++ new/src/java.desktop/unix/native/common/awt/awt_Font.c 2018-11-26 16:07:30.699597181 +0530 @@ -50,6 +50,9 @@ static void pDataDisposeMethod(JNIEnv *env, jlong pData); /* #define FONT_DEBUG 2 */ +#ifndef FONT_DEBUG +#define FONT_DEBUG 0 +#endif /* 1- print failures, 2- print all, 3- terminate on failure */ #if FONT_DEBUG static XFontStruct *XLoadQueryFontX(Display *display, char *name) --- old/src/java.desktop/unix/native/common/awt/fontpath.c 2018-11-26 16:07:31.539177181 +0530 +++ new/src/java.desktop/unix/native/common/awt/fontpath.c 2018-11-26 16:07:31.263315181 +0530 @@ -286,7 +286,7 @@ /* printf ( "Appending %s\n", fDirP->name[index] ); */ - onePath = SAFE_SIZE_ARRAY_ALLOC(malloc, strlen (fDirP->name[index]) + 2, sizeof( char ) ); + onePath = SAFE_SIZE_ARRAY_ALLOC(malloc, (int)strlen (fDirP->name[index]) + 2, (int)sizeof( char ) ); if (onePath == NULL) { free ( ( void *) appendDirList ); --- old/src/java.desktop/unix/native/common/java2d/x11/X11SurfaceData.c 2018-11-26 16:07:32.110891181 +0530 +++ new/src/java.desktop/unix/native/common/java2d/x11/X11SurfaceData.c 2018-11-26 16:07:31.839027181 +0530 @@ -1075,7 +1075,8 @@ break; } } - /* FALL THROUGH for 32-bit case */ + /* FALLTHROUGH for 32-bit case */ + // fall through case 32: { /* ABCD -> DCBA */ --- old/src/java.desktop/unix/native/libawt/awt/awt_LoadLibrary.c 2018-11-26 16:07:32.650621181 +0530 +++ new/src/java.desktop/unix/native/libawt/awt/awt_LoadLibrary.c 2018-11-26 16:07:32.378757181 +0530 @@ -121,7 +121,8 @@ /* Get address of this library and the directory containing it. */ dladdr((void *)AWT_OnLoad, &dlinfo); - realpath((char *)dlinfo.dli_fname, buf); + char* res = realpath((char *)dlinfo.dli_fname, buf); + (void)res; len = strlen(buf); p = strrchr(buf, '/'); --- old/src/java.desktop/unix/native/libawt/awt/awt_Mlib.c 2018-11-26 16:07:33.226333181 +0530 +++ new/src/java.desktop/unix/native/libawt/awt/awt_Mlib.c 2018-11-26 16:07:32.954469181 +0530 @@ -60,13 +60,13 @@ struct utsname name; /* - * Find out the machine name. If it is an SUN ultra, we + * Find out the machine name. If it is a SUN ultra, we * can use the vis library */ if ((uname(&name) >= 0) && (getenv("NO_VIS") == NULL) && - (strncmp(name.machine, "sun4u" , 5) == 0) || - ((strncmp(name.machine, "sun4v" , 5) == 0) && - (getenv("USE_VIS_ON_SUN4V") != NULL))) + ((strncmp(name.machine, "sun4u" , 5) == 0) || + (strncmp(name.machine, "sun4v" , 5) == 0)) && + (getenv("USE_VIS_ON_SUN4V") != NULL)) { handle = dlopen(JNI_LIB_NAME("mlib_image_v"), RTLD_LAZY); } --- old/src/java.desktop/unix/native/libawt_xawt/awt/gtk2_interface.c 2018-11-26 16:07:33.786053181 +0530 +++ new/src/java.desktop/unix/native/libawt_xawt/awt/gtk2_interface.c 2018-11-26 16:07:33.510191181 +0530 @@ -771,7 +771,7 @@ if (tmp_env) { /* the new env will be smaller than the old one */ gchar *s, *new_env = SAFE_SIZE_STRUCT_ALLOC(malloc, - sizeof(ENV_PREFIX), 1, strlen (gtk_modules_env)); + (int)sizeof(ENV_PREFIX), 1, (int)strlen (gtk_modules_env)); if (new_env) { strcpy(new_env, ENV_PREFIX); @@ -1091,8 +1091,8 @@ ((GtkObject*)gtk2_widget)->flags &= ~GTK_HAS_FOCUS; } - if ((synth_state & MOUSE_OVER) != 0 && (synth_state & PRESSED) == 0 || - (synth_state & FOCUSED) != 0 && (synth_state & PRESSED) != 0) { + if (((synth_state & MOUSE_OVER) != 0 && (synth_state & PRESSED) == 0) || + ((synth_state & FOCUSED) != 0 && (synth_state & PRESSED) != 0)) { gtk2_widget->state = GTK_STATE_PRELIGHT; } else if ((synth_state & DISABLED) != 0) { gtk2_widget->state = GTK_STATE_INSENSITIVE; @@ -1161,14 +1161,14 @@ { case BUTTON: case TABLE_HEADER: - if (init_result = (NULL == gtk2_widgets[_GTK_BUTTON_TYPE])) + if ((init_result = (NULL == gtk2_widgets[_GTK_BUTTON_TYPE]))) { gtk2_widgets[_GTK_BUTTON_TYPE] = (*fp_gtk_button_new)(); } result = gtk2_widgets[_GTK_BUTTON_TYPE]; break; case CHECK_BOX: - if (init_result = (NULL == gtk2_widgets[_GTK_CHECK_BUTTON_TYPE])) + if ((init_result = (NULL == gtk2_widgets[_GTK_CHECK_BUTTON_TYPE]))) { gtk2_widgets[_GTK_CHECK_BUTTON_TYPE] = (*fp_gtk_check_button_new)(); @@ -1176,7 +1176,7 @@ result = gtk2_widgets[_GTK_CHECK_BUTTON_TYPE]; break; case CHECK_BOX_MENU_ITEM: - if (init_result = (NULL == gtk2_widgets[_GTK_CHECK_MENU_ITEM_TYPE])) + if ((init_result = (NULL == gtk2_widgets[_GTK_CHECK_MENU_ITEM_TYPE]))) { gtk2_widgets[_GTK_CHECK_MENU_ITEM_TYPE] = (*fp_gtk_check_menu_item_new)(); @@ -1188,8 +1188,8 @@ * it deadlocks the EDT ************************************************************/ /* case COLOR_CHOOSER: - if (init_result = - (NULL == gtk2_widgets[_GTK_COLOR_SELECTION_DIALOG_TYPE])) + if ((init_result = + (NULL == gtk2_widgets[_GTK_COLOR_SELECTION_DIALOG_TYPE]))) { gtk2_widgets[_GTK_COLOR_SELECTION_DIALOG_TYPE] = (*fp_gtk_color_selection_dialog_new)(NULL); @@ -1197,7 +1197,7 @@ result = gtk2_widgets[_GTK_COLOR_SELECTION_DIALOG_TYPE]; break;*/ case COMBO_BOX: - if (init_result = (NULL == gtk2_widgets[_GTK_COMBO_BOX_TYPE])) + if ((init_result = (NULL == gtk2_widgets[_GTK_COMBO_BOX_TYPE]))) { gtk2_widgets[_GTK_COMBO_BOX_TYPE] = (*fp_gtk_combo_box_new)(); @@ -1205,8 +1205,8 @@ result = gtk2_widgets[_GTK_COMBO_BOX_TYPE]; break; case COMBO_BOX_ARROW_BUTTON: - if (init_result = - (NULL == gtk2_widgets[_GTK_COMBO_BOX_ARROW_BUTTON_TYPE])) + if ((init_result = + (NULL == gtk2_widgets[_GTK_COMBO_BOX_ARROW_BUTTON_TYPE]))) { gtk2_widgets[_GTK_COMBO_BOX_ARROW_BUTTON_TYPE] = (*fp_gtk_toggle_button_new)(); @@ -1214,8 +1214,8 @@ result = gtk2_widgets[_GTK_COMBO_BOX_ARROW_BUTTON_TYPE]; break; case COMBO_BOX_TEXT_FIELD: - if (init_result = - (NULL == gtk2_widgets[_GTK_COMBO_BOX_TEXT_FIELD_TYPE])) + if ((init_result = + (NULL == gtk2_widgets[_GTK_COMBO_BOX_TEXT_FIELD_TYPE]))) { result = gtk2_widgets[_GTK_COMBO_BOX_TEXT_FIELD_TYPE] = (*fp_gtk_entry_new)(); @@ -1225,7 +1225,7 @@ case DESKTOP_ICON: case INTERNAL_FRAME_TITLE_PANE: case LABEL: - if (init_result = (NULL == gtk2_widgets[_GTK_LABEL_TYPE])) + if ((init_result = (NULL == gtk2_widgets[_GTK_LABEL_TYPE]))) { gtk2_widgets[_GTK_LABEL_TYPE] = (*fp_gtk_label_new)(NULL); @@ -1235,7 +1235,7 @@ case DESKTOP_PANE: case PANEL: case ROOT_PANE: - if (init_result = (NULL == gtk2_widgets[_GTK_CONTAINER_TYPE])) + if ((init_result = (NULL == gtk2_widgets[_GTK_CONTAINER_TYPE]))) { /* There is no constructor for a container type. I've * chosen GtkFixed container since it has a default @@ -1249,7 +1249,7 @@ case EDITOR_PANE: case TEXT_AREA: case TEXT_PANE: - if (init_result = (NULL == gtk2_widgets[_GTK_TEXT_VIEW_TYPE])) + if ((init_result = (NULL == gtk2_widgets[_GTK_TEXT_VIEW_TYPE]))) { gtk2_widgets[_GTK_TEXT_VIEW_TYPE] = (*fp_gtk_text_view_new)(); @@ -1259,7 +1259,7 @@ case FORMATTED_TEXT_FIELD: case PASSWORD_FIELD: case TEXT_FIELD: - if (init_result = (NULL == gtk2_widgets[_GTK_ENTRY_TYPE])) + if ((init_result = (NULL == gtk2_widgets[_GTK_ENTRY_TYPE]))) { gtk2_widgets[_GTK_ENTRY_TYPE] = (*fp_gtk_entry_new)(); @@ -1267,7 +1267,7 @@ result = gtk2_widgets[_GTK_ENTRY_TYPE]; break; case HANDLE_BOX: - if (init_result = (NULL == gtk2_widgets[_GTK_HANDLE_BOX_TYPE])) + if ((init_result = (NULL == gtk2_widgets[_GTK_HANDLE_BOX_TYPE]))) { gtk2_widgets[_GTK_HANDLE_BOX_TYPE] = (*fp_gtk_handle_box_new)(); @@ -1279,7 +1279,7 @@ case HSCROLL_BAR_BUTTON_RIGHT: case HSCROLL_BAR_TRACK: case HSCROLL_BAR_THUMB: - if (init_result = (NULL == gtk2_widgets[_GTK_HSCROLLBAR_TYPE])) + if ((init_result = (NULL == gtk2_widgets[_GTK_HSCROLLBAR_TYPE]))) { gtk2_widgets[_GTK_HSCROLLBAR_TYPE] = (*fp_gtk_hscrollbar_new)(create_adjustment()); @@ -1287,7 +1287,7 @@ result = gtk2_widgets[_GTK_HSCROLLBAR_TYPE]; break; case HSEPARATOR: - if (init_result = (NULL == gtk2_widgets[_GTK_HSEPARATOR_TYPE])) + if ((init_result = (NULL == gtk2_widgets[_GTK_HSEPARATOR_TYPE]))) { gtk2_widgets[_GTK_HSEPARATOR_TYPE] = (*fp_gtk_hseparator_new)(); @@ -1297,7 +1297,7 @@ case HSLIDER: case HSLIDER_THUMB: case HSLIDER_TRACK: - if (init_result = (NULL == gtk2_widgets[_GTK_HSCALE_TYPE])) + if ((init_result = (NULL == gtk2_widgets[_GTK_HSCALE_TYPE]))) { gtk2_widgets[_GTK_HSCALE_TYPE] = (*fp_gtk_hscale_new)(NULL); @@ -1306,21 +1306,21 @@ break; case HSPLIT_PANE_DIVIDER: case SPLIT_PANE: - if (init_result = (NULL == gtk2_widgets[_GTK_HPANED_TYPE])) + if ((init_result = (NULL == gtk2_widgets[_GTK_HPANED_TYPE]))) { gtk2_widgets[_GTK_HPANED_TYPE] = (*fp_gtk_hpaned_new)(); } result = gtk2_widgets[_GTK_HPANED_TYPE]; break; case IMAGE: - if (init_result = (NULL == gtk2_widgets[_GTK_IMAGE_TYPE])) + if ((init_result = (NULL == gtk2_widgets[_GTK_IMAGE_TYPE]))) { gtk2_widgets[_GTK_IMAGE_TYPE] = (*fp_gtk_image_new)(); } result = gtk2_widgets[_GTK_IMAGE_TYPE]; break; case INTERNAL_FRAME: - if (init_result = (NULL == gtk2_widgets[_GTK_WINDOW_TYPE])) + if ((init_result = (NULL == gtk2_widgets[_GTK_WINDOW_TYPE]))) { gtk2_widgets[_GTK_WINDOW_TYPE] = (*fp_gtk_window_new)(GTK_WINDOW_TOPLEVEL); @@ -1328,7 +1328,7 @@ result = gtk2_widgets[_GTK_WINDOW_TYPE]; break; case TOOL_TIP: - if (init_result = (NULL == gtk2_widgets[_GTK_TOOLTIP_TYPE])) + if ((init_result = (NULL == gtk2_widgets[_GTK_TOOLTIP_TYPE]))) { result = (*fp_gtk_window_new)(GTK_WINDOW_TOPLEVEL); (*fp_gtk_widget_set_name)(result, "gtk-tooltips"); @@ -1340,7 +1340,7 @@ case TABLE: case TREE: case TREE_CELL: - if (init_result = (NULL == gtk2_widgets[_GTK_TREE_VIEW_TYPE])) + if ((init_result = (NULL == gtk2_widgets[_GTK_TREE_VIEW_TYPE]))) { gtk2_widgets[_GTK_TREE_VIEW_TYPE] = (*fp_gtk_tree_view_new)(); @@ -1348,14 +1348,14 @@ result = gtk2_widgets[_GTK_TREE_VIEW_TYPE]; break; case TITLED_BORDER: - if (init_result = (NULL == gtk2_widgets[_GTK_FRAME_TYPE])) + if ((init_result = (NULL == gtk2_widgets[_GTK_FRAME_TYPE]))) { gtk2_widgets[_GTK_FRAME_TYPE] = fp_gtk_frame_new(NULL); } result = gtk2_widgets[_GTK_FRAME_TYPE]; break; case POPUP_MENU: - if (init_result = (NULL == gtk2_widgets[_GTK_MENU_TYPE])) + if ((init_result = (NULL == gtk2_widgets[_GTK_MENU_TYPE]))) { gtk2_widgets[_GTK_MENU_TYPE] = (*fp_gtk_menu_new)(); @@ -1365,7 +1365,7 @@ case MENU: case MENU_ITEM: case MENU_ITEM_ACCELERATOR: - if (init_result = (NULL == gtk2_widgets[_GTK_MENU_ITEM_TYPE])) + if ((init_result = (NULL == gtk2_widgets[_GTK_MENU_ITEM_TYPE]))) { gtk2_widgets[_GTK_MENU_ITEM_TYPE] = (*fp_gtk_menu_item_new)(); @@ -1373,7 +1373,7 @@ result = gtk2_widgets[_GTK_MENU_ITEM_TYPE]; break; case MENU_BAR: - if (init_result = (NULL == gtk2_widgets[_GTK_MENU_BAR_TYPE])) + if ((init_result = (NULL == gtk2_widgets[_GTK_MENU_BAR_TYPE]))) { gtk2_widgets[_GTK_MENU_BAR_TYPE] = (*fp_gtk_menu_bar_new)(); @@ -1382,7 +1382,7 @@ break; case COLOR_CHOOSER: case OPTION_PANE: - if (init_result = (NULL == gtk2_widgets[_GTK_DIALOG_TYPE])) + if ((init_result = (NULL == gtk2_widgets[_GTK_DIALOG_TYPE]))) { gtk2_widgets[_GTK_DIALOG_TYPE] = (*fp_gtk_dialog_new)(); @@ -1390,8 +1390,8 @@ result = gtk2_widgets[_GTK_DIALOG_TYPE]; break; case POPUP_MENU_SEPARATOR: - if (init_result = - (NULL == gtk2_widgets[_GTK_SEPARATOR_MENU_ITEM_TYPE])) + if ((init_result = + (NULL == gtk2_widgets[_GTK_SEPARATOR_MENU_ITEM_TYPE]))) { gtk2_widgets[_GTK_SEPARATOR_MENU_ITEM_TYPE] = (*fp_gtk_separator_menu_item_new)(); @@ -1399,7 +1399,7 @@ result = gtk2_widgets[_GTK_SEPARATOR_MENU_ITEM_TYPE]; break; case HPROGRESS_BAR: - if (init_result = (NULL == gtk2_widgets[_GTK_HPROGRESS_BAR_TYPE])) + if ((init_result = (NULL == gtk2_widgets[_GTK_HPROGRESS_BAR_TYPE]))) { gtk2_widgets[_GTK_HPROGRESS_BAR_TYPE] = (*fp_gtk_progress_bar_new)(); @@ -1407,7 +1407,7 @@ result = gtk2_widgets[_GTK_HPROGRESS_BAR_TYPE]; break; case VPROGRESS_BAR: - if (init_result = (NULL == gtk2_widgets[_GTK_VPROGRESS_BAR_TYPE])) + if ((init_result = (NULL == gtk2_widgets[_GTK_VPROGRESS_BAR_TYPE]))) { gtk2_widgets[_GTK_VPROGRESS_BAR_TYPE] = (*fp_gtk_progress_bar_new)(); @@ -1422,7 +1422,7 @@ result = gtk2_widgets[_GTK_VPROGRESS_BAR_TYPE]; break; case RADIO_BUTTON: - if (init_result = (NULL == gtk2_widgets[_GTK_RADIO_BUTTON_TYPE])) + if ((init_result = (NULL == gtk2_widgets[_GTK_RADIO_BUTTON_TYPE]))) { gtk2_widgets[_GTK_RADIO_BUTTON_TYPE] = (*fp_gtk_radio_button_new)(NULL); @@ -1430,8 +1430,8 @@ result = gtk2_widgets[_GTK_RADIO_BUTTON_TYPE]; break; case RADIO_BUTTON_MENU_ITEM: - if (init_result = - (NULL == gtk2_widgets[_GTK_RADIO_MENU_ITEM_TYPE])) + if ((init_result = + (NULL == gtk2_widgets[_GTK_RADIO_MENU_ITEM_TYPE]))) { gtk2_widgets[_GTK_RADIO_MENU_ITEM_TYPE] = (*fp_gtk_radio_menu_item_new)(NULL); @@ -1439,8 +1439,8 @@ result = gtk2_widgets[_GTK_RADIO_MENU_ITEM_TYPE]; break; case SCROLL_PANE: - if (init_result = - (NULL == gtk2_widgets[_GTK_SCROLLED_WINDOW_TYPE])) + if ((init_result = + (NULL == gtk2_widgets[_GTK_SCROLLED_WINDOW_TYPE]))) { gtk2_widgets[_GTK_SCROLLED_WINDOW_TYPE] = (*fp_gtk_scrolled_window_new)(NULL, NULL); @@ -1450,7 +1450,7 @@ case SPINNER: case SPINNER_ARROW_BUTTON: case SPINNER_TEXT_FIELD: - if (init_result = (NULL == gtk2_widgets[_GTK_SPIN_BUTTON_TYPE])) + if ((init_result = (NULL == gtk2_widgets[_GTK_SPIN_BUTTON_TYPE]))) { result = gtk2_widgets[_GTK_SPIN_BUTTON_TYPE] = (*fp_gtk_spin_button_new)(NULL, 0, 0); @@ -1461,7 +1461,7 @@ case TABBED_PANE_TAB_AREA: case TABBED_PANE_CONTENT: case TABBED_PANE_TAB: - if (init_result = (NULL == gtk2_widgets[_GTK_NOTEBOOK_TYPE])) + if ((init_result = (NULL == gtk2_widgets[_GTK_NOTEBOOK_TYPE]))) { gtk2_widgets[_GTK_NOTEBOOK_TYPE] = (*fp_gtk_notebook_new)(NULL); @@ -1469,7 +1469,7 @@ result = gtk2_widgets[_GTK_NOTEBOOK_TYPE]; break; case TOGGLE_BUTTON: - if (init_result = (NULL == gtk2_widgets[_GTK_TOGGLE_BUTTON_TYPE])) + if ((init_result = (NULL == gtk2_widgets[_GTK_TOGGLE_BUTTON_TYPE]))) { gtk2_widgets[_GTK_TOGGLE_BUTTON_TYPE] = (*fp_gtk_toggle_button_new)(NULL); @@ -1478,7 +1478,7 @@ break; case TOOL_BAR: case TOOL_BAR_DRAG_WINDOW: - if (init_result = (NULL == gtk2_widgets[_GTK_TOOLBAR_TYPE])) + if ((init_result = (NULL == gtk2_widgets[_GTK_TOOLBAR_TYPE]))) { gtk2_widgets[_GTK_TOOLBAR_TYPE] = (*fp_gtk_toolbar_new)(NULL); @@ -1486,8 +1486,8 @@ result = gtk2_widgets[_GTK_TOOLBAR_TYPE]; break; case TOOL_BAR_SEPARATOR: - if (init_result = - (NULL == gtk2_widgets[_GTK_SEPARATOR_TOOL_ITEM_TYPE])) + if ((init_result = + (NULL == gtk2_widgets[_GTK_SEPARATOR_TOOL_ITEM_TYPE]))) { gtk2_widgets[_GTK_SEPARATOR_TOOL_ITEM_TYPE] = (*fp_gtk_separator_tool_item_new)(); @@ -1495,7 +1495,7 @@ result = gtk2_widgets[_GTK_SEPARATOR_TOOL_ITEM_TYPE]; break; case VIEWPORT: - if (init_result = (NULL == gtk2_widgets[_GTK_VIEWPORT_TYPE])) + if ((init_result = (NULL == gtk2_widgets[_GTK_VIEWPORT_TYPE]))) { GtkAdjustment *adjustment = create_adjustment(); gtk2_widgets[_GTK_VIEWPORT_TYPE] = @@ -1508,7 +1508,7 @@ case VSCROLL_BAR_BUTTON_DOWN: case VSCROLL_BAR_TRACK: case VSCROLL_BAR_THUMB: - if (init_result = (NULL == gtk2_widgets[_GTK_VSCROLLBAR_TYPE])) + if ((init_result = (NULL == gtk2_widgets[_GTK_VSCROLLBAR_TYPE]))) { gtk2_widgets[_GTK_VSCROLLBAR_TYPE] = (*fp_gtk_vscrollbar_new)(create_adjustment()); @@ -1516,7 +1516,7 @@ result = gtk2_widgets[_GTK_VSCROLLBAR_TYPE]; break; case VSEPARATOR: - if (init_result = (NULL == gtk2_widgets[_GTK_VSEPARATOR_TYPE])) + if ((init_result = (NULL == gtk2_widgets[_GTK_VSEPARATOR_TYPE]))) { gtk2_widgets[_GTK_VSEPARATOR_TYPE] = (*fp_gtk_vseparator_new)(); @@ -1526,7 +1526,7 @@ case VSLIDER: case VSLIDER_THUMB: case VSLIDER_TRACK: - if (init_result = (NULL == gtk2_widgets[_GTK_VSCALE_TYPE])) + if ((init_result = (NULL == gtk2_widgets[_GTK_VSCALE_TYPE]))) { gtk2_widgets[_GTK_VSCALE_TYPE] = (*fp_gtk_vscale_new)(NULL); @@ -1540,7 +1540,7 @@ ((GtkRange*)result)->inverted = 1; break; case VSPLIT_PANE_DIVIDER: - if (init_result = (NULL == gtk2_widgets[_GTK_VPANED_TYPE])) + if ((init_result = (NULL == gtk2_widgets[_GTK_VPANED_TYPE]))) { gtk2_widgets[_GTK_VPANED_TYPE] = (*fp_gtk_vpaned_new)(); } @@ -2451,14 +2451,14 @@ static jobject get_integer_property(JNIEnv *env, GtkSettings* settings, const gchar* key) { - gint intval = NULL; + gint intval = 0; (*fp_g_object_get)(settings, key, &intval, NULL); return create_Integer(env, intval); } static jobject get_boolean_property(JNIEnv *env, GtkSettings* settings, const gchar* key) { - gint intval = NULL; + gint intval = 0; (*fp_g_object_get)(settings, key, &intval, NULL); return create_Boolean(env, intval); } --- old/src/java.desktop/unix/native/libawt_xawt/awt/gtk3_interface.c 2018-11-26 16:07:34.341775181 +0530 +++ new/src/java.desktop/unix/native/libawt_xawt/awt/gtk3_interface.c 2018-11-26 16:07:34.069911181 +0530 @@ -591,7 +591,7 @@ if (tmp_env) { /* the new env will be smaller than the old one */ gchar *s, *new_env = SAFE_SIZE_STRUCT_ALLOC(malloc, - sizeof(ENV_PREFIX), 1, strlen (gtk_modules_env)); + (int)sizeof(ENV_PREFIX), 1, (int)strlen (gtk_modules_env)); if (new_env) { strcpy(new_env, ENV_PREFIX); @@ -922,14 +922,14 @@ { case BUTTON: case TABLE_HEADER: - if (init_result = (NULL == gtk3_widgets[_GTK_BUTTON_TYPE])) + if ((init_result = (NULL == gtk3_widgets[_GTK_BUTTON_TYPE]))) { gtk3_widgets[_GTK_BUTTON_TYPE] = (*fp_gtk_button_new)(); } result = gtk3_widgets[_GTK_BUTTON_TYPE]; break; case CHECK_BOX: - if (init_result = (NULL == gtk3_widgets[_GTK_CHECK_BUTTON_TYPE])) + if ((init_result = (NULL == gtk3_widgets[_GTK_CHECK_BUTTON_TYPE]))) { gtk3_widgets[_GTK_CHECK_BUTTON_TYPE] = (*fp_gtk_check_button_new)(); @@ -937,7 +937,7 @@ result = gtk3_widgets[_GTK_CHECK_BUTTON_TYPE]; break; case CHECK_BOX_MENU_ITEM: - if (init_result = (NULL == gtk3_widgets[_GTK_CHECK_MENU_ITEM_TYPE])) + if ((init_result = (NULL == gtk3_widgets[_GTK_CHECK_MENU_ITEM_TYPE]))) { gtk3_widgets[_GTK_CHECK_MENU_ITEM_TYPE] = (*fp_gtk_check_menu_item_new)(); @@ -958,7 +958,7 @@ result = gtk3_widgets[_GTK_COLOR_SELECTION_DIALOG_TYPE]; break;*/ case COMBO_BOX: - if (init_result = (NULL == gtk3_widgets[_GTK_COMBO_BOX_TYPE])) + if ((init_result = (NULL == gtk3_widgets[_GTK_COMBO_BOX_TYPE]))) { gtk3_widgets[_GTK_COMBO_BOX_TYPE] = (*fp_gtk_combo_box_new)(); @@ -966,8 +966,8 @@ result = gtk3_widgets[_GTK_COMBO_BOX_TYPE]; break; case COMBO_BOX_ARROW_BUTTON: - if (init_result = - (NULL == gtk3_widgets[_GTK_COMBO_BOX_ARROW_BUTTON_TYPE])) + if ((init_result = + (NULL == gtk3_widgets[_GTK_COMBO_BOX_ARROW_BUTTON_TYPE]))) { gtk3_widgets[_GTK_COMBO_BOX_ARROW_BUTTON_TYPE] = (*fp_gtk_toggle_button_new)(); @@ -975,8 +975,8 @@ result = gtk3_widgets[_GTK_COMBO_BOX_ARROW_BUTTON_TYPE]; break; case COMBO_BOX_TEXT_FIELD: - if (init_result = - (NULL == gtk3_widgets[_GTK_COMBO_BOX_TEXT_FIELD_TYPE])) + if ((init_result = + (NULL == gtk3_widgets[_GTK_COMBO_BOX_TEXT_FIELD_TYPE]))) { result = gtk3_widgets[_GTK_COMBO_BOX_TEXT_FIELD_TYPE] = (*fp_gtk_entry_new)(); @@ -986,7 +986,7 @@ case DESKTOP_ICON: case INTERNAL_FRAME_TITLE_PANE: case LABEL: - if (init_result = (NULL == gtk3_widgets[_GTK_LABEL_TYPE])) + if ((init_result = (NULL == gtk3_widgets[_GTK_LABEL_TYPE]))) { gtk3_widgets[_GTK_LABEL_TYPE] = (*fp_gtk_label_new)(NULL); @@ -996,7 +996,7 @@ case DESKTOP_PANE: case PANEL: case ROOT_PANE: - if (init_result = (NULL == gtk3_widgets[_GTK_CONTAINER_TYPE])) + if ((init_result = (NULL == gtk3_widgets[_GTK_CONTAINER_TYPE]))) { /* There is no constructor for a container type. I've * chosen GtkFixed container since it has a default @@ -1010,7 +1010,7 @@ case EDITOR_PANE: case TEXT_AREA: case TEXT_PANE: - if (init_result = (NULL == gtk3_widgets[_GTK_TEXT_VIEW_TYPE])) + if ((init_result = (NULL == gtk3_widgets[_GTK_TEXT_VIEW_TYPE]))) { gtk3_widgets[_GTK_TEXT_VIEW_TYPE] = (*fp_gtk_text_view_new)(); @@ -1020,7 +1020,7 @@ case FORMATTED_TEXT_FIELD: case PASSWORD_FIELD: case TEXT_FIELD: - if (init_result = (NULL == gtk3_widgets[_GTK_ENTRY_TYPE])) + if ((init_result = (NULL == gtk3_widgets[_GTK_ENTRY_TYPE]))) { gtk3_widgets[_GTK_ENTRY_TYPE] = (*fp_gtk_entry_new)(); @@ -1028,7 +1028,7 @@ result = gtk3_widgets[_GTK_ENTRY_TYPE]; break; case HANDLE_BOX: - if (init_result = (NULL == gtk3_widgets[_GTK_HANDLE_BOX_TYPE])) + if ((init_result = (NULL == gtk3_widgets[_GTK_HANDLE_BOX_TYPE]))) { gtk3_widgets[_GTK_HANDLE_BOX_TYPE] = (*fp_gtk_handle_box_new)(); @@ -1040,7 +1040,7 @@ case HSCROLL_BAR_BUTTON_RIGHT: case HSCROLL_BAR_TRACK: case HSCROLL_BAR_THUMB: - if (init_result = (NULL == gtk3_widgets[_GTK_HSCROLLBAR_TYPE])) + if ((init_result = (NULL == gtk3_widgets[_GTK_HSCROLLBAR_TYPE]))) { gtk3_widgets[_GTK_HSCROLLBAR_TYPE] = (*fp_gtk_hscrollbar_new)(create_adjustment()); @@ -1048,7 +1048,7 @@ result = gtk3_widgets[_GTK_HSCROLLBAR_TYPE]; break; case HSEPARATOR: - if (init_result = (NULL == gtk3_widgets[_GTK_HSEPARATOR_TYPE])) + if ((init_result = (NULL == gtk3_widgets[_GTK_HSEPARATOR_TYPE]))) { gtk3_widgets[_GTK_HSEPARATOR_TYPE] = (*fp_gtk_hseparator_new)(); @@ -1058,7 +1058,7 @@ case HSLIDER: case HSLIDER_THUMB: case HSLIDER_TRACK: - if (init_result = (NULL == gtk3_widgets[_GTK_HSCALE_TYPE])) + if ((init_result = (NULL == gtk3_widgets[_GTK_HSCALE_TYPE]))) { gtk3_widgets[_GTK_HSCALE_TYPE] = (*fp_gtk_scale_new)(GTK_ORIENTATION_HORIZONTAL, NULL); @@ -1067,21 +1067,21 @@ break; case HSPLIT_PANE_DIVIDER: case SPLIT_PANE: - if (init_result = (NULL == gtk3_widgets[_GTK_HPANED_TYPE])) + if ((init_result = (NULL == gtk3_widgets[_GTK_HPANED_TYPE]))) { gtk3_widgets[_GTK_HPANED_TYPE] = (*fp_gtk_hpaned_new)(); } result = gtk3_widgets[_GTK_HPANED_TYPE]; break; case IMAGE: - if (init_result = (NULL == gtk3_widgets[_GTK_IMAGE_TYPE])) + if ((init_result = (NULL == gtk3_widgets[_GTK_IMAGE_TYPE]))) { gtk3_widgets[_GTK_IMAGE_TYPE] = (*fp_gtk_image_new)(); } result = gtk3_widgets[_GTK_IMAGE_TYPE]; break; case INTERNAL_FRAME: - if (init_result = (NULL == gtk3_widgets[_GTK_WINDOW_TYPE])) + if ((init_result = (NULL == gtk3_widgets[_GTK_WINDOW_TYPE]))) { gtk3_widgets[_GTK_WINDOW_TYPE] = (*fp_gtk_window_new)(GTK_WINDOW_TOPLEVEL); @@ -1089,7 +1089,7 @@ result = gtk3_widgets[_GTK_WINDOW_TYPE]; break; case TOOL_TIP: - if (init_result = (NULL == gtk3_widgets[_GTK_TOOLTIP_TYPE])) + if ((init_result = (NULL == gtk3_widgets[_GTK_TOOLTIP_TYPE]))) { result = (*fp_gtk_window_new)(GTK_WINDOW_TOPLEVEL); gtk3_widgets[_GTK_TOOLTIP_TYPE] = result; @@ -1100,7 +1100,7 @@ case TABLE: case TREE: case TREE_CELL: - if (init_result = (NULL == gtk3_widgets[_GTK_TREE_VIEW_TYPE])) + if ((init_result = (NULL == gtk3_widgets[_GTK_TREE_VIEW_TYPE]))) { gtk3_widgets[_GTK_TREE_VIEW_TYPE] = (*fp_gtk_tree_view_new)(); @@ -1108,14 +1108,14 @@ result = gtk3_widgets[_GTK_TREE_VIEW_TYPE]; break; case TITLED_BORDER: - if (init_result = (NULL == gtk3_widgets[_GTK_FRAME_TYPE])) + if ((init_result = (NULL == gtk3_widgets[_GTK_FRAME_TYPE]))) { gtk3_widgets[_GTK_FRAME_TYPE] = fp_gtk_frame_new(NULL); } result = gtk3_widgets[_GTK_FRAME_TYPE]; break; case POPUP_MENU: - if (init_result = (NULL == gtk3_widgets[_GTK_MENU_TYPE])) + if ((init_result = (NULL == gtk3_widgets[_GTK_MENU_TYPE]))) { gtk3_widgets[_GTK_MENU_TYPE] = (*fp_gtk_menu_new)(); @@ -1125,7 +1125,7 @@ case MENU: case MENU_ITEM: case MENU_ITEM_ACCELERATOR: - if (init_result = (NULL == gtk3_widgets[_GTK_MENU_ITEM_TYPE])) + if ((init_result = (NULL == gtk3_widgets[_GTK_MENU_ITEM_TYPE]))) { gtk3_widgets[_GTK_MENU_ITEM_TYPE] = (*fp_gtk_menu_item_new)(); @@ -1133,7 +1133,7 @@ result = gtk3_widgets[_GTK_MENU_ITEM_TYPE]; break; case MENU_BAR: - if (init_result = (NULL == gtk3_widgets[_GTK_MENU_BAR_TYPE])) + if ((init_result = (NULL == gtk3_widgets[_GTK_MENU_BAR_TYPE]))) { gtk3_widgets[_GTK_MENU_BAR_TYPE] = (*fp_gtk_menu_bar_new)(); @@ -1142,7 +1142,7 @@ break; case COLOR_CHOOSER: case OPTION_PANE: - if (init_result = (NULL == gtk3_widgets[_GTK_DIALOG_TYPE])) + if ((init_result = (NULL == gtk3_widgets[_GTK_DIALOG_TYPE]))) { gtk3_widgets[_GTK_DIALOG_TYPE] = (*fp_gtk_dialog_new)(); @@ -1150,8 +1150,8 @@ result = gtk3_widgets[_GTK_DIALOG_TYPE]; break; case POPUP_MENU_SEPARATOR: - if (init_result = - (NULL == gtk3_widgets[_GTK_SEPARATOR_MENU_ITEM_TYPE])) + if ((init_result = + (NULL == gtk3_widgets[_GTK_SEPARATOR_MENU_ITEM_TYPE]))) { gtk3_widgets[_GTK_SEPARATOR_MENU_ITEM_TYPE] = (*fp_gtk_separator_menu_item_new)(); @@ -1159,7 +1159,7 @@ result = gtk3_widgets[_GTK_SEPARATOR_MENU_ITEM_TYPE]; break; case HPROGRESS_BAR: - if (init_result = (NULL == gtk3_widgets[_GTK_HPROGRESS_BAR_TYPE])) + if ((init_result = (NULL == gtk3_widgets[_GTK_HPROGRESS_BAR_TYPE]))) { gtk3_widgets[_GTK_HPROGRESS_BAR_TYPE] = (*fp_gtk_progress_bar_new)(); @@ -1167,7 +1167,7 @@ result = gtk3_widgets[_GTK_HPROGRESS_BAR_TYPE]; break; case VPROGRESS_BAR: - if (init_result = (NULL == gtk3_widgets[_GTK_VPROGRESS_BAR_TYPE])) + if ((init_result = (NULL == gtk3_widgets[_GTK_VPROGRESS_BAR_TYPE]))) { gtk3_widgets[_GTK_VPROGRESS_BAR_TYPE] = (*fp_gtk_progress_bar_new)(); @@ -1182,7 +1182,7 @@ result = gtk3_widgets[_GTK_VPROGRESS_BAR_TYPE]; break; case RADIO_BUTTON: - if (init_result = (NULL == gtk3_widgets[_GTK_RADIO_BUTTON_TYPE])) + if ((init_result = (NULL == gtk3_widgets[_GTK_RADIO_BUTTON_TYPE]))) { gtk3_widgets[_GTK_RADIO_BUTTON_TYPE] = (*fp_gtk_radio_button_new)(NULL); @@ -1190,8 +1190,8 @@ result = gtk3_widgets[_GTK_RADIO_BUTTON_TYPE]; break; case RADIO_BUTTON_MENU_ITEM: - if (init_result = - (NULL == gtk3_widgets[_GTK_RADIO_MENU_ITEM_TYPE])) + if ((init_result = + (NULL == gtk3_widgets[_GTK_RADIO_MENU_ITEM_TYPE]))) { gtk3_widgets[_GTK_RADIO_MENU_ITEM_TYPE] = (*fp_gtk_radio_menu_item_new)(NULL); @@ -1199,8 +1199,8 @@ result = gtk3_widgets[_GTK_RADIO_MENU_ITEM_TYPE]; break; case SCROLL_PANE: - if (init_result = - (NULL == gtk3_widgets[_GTK_SCROLLED_WINDOW_TYPE])) + if ((init_result = + (NULL == gtk3_widgets[_GTK_SCROLLED_WINDOW_TYPE]))) { gtk3_widgets[_GTK_SCROLLED_WINDOW_TYPE] = (*fp_gtk_scrolled_window_new)(NULL, NULL); @@ -1210,7 +1210,7 @@ case SPINNER: case SPINNER_ARROW_BUTTON: case SPINNER_TEXT_FIELD: - if (init_result = (NULL == gtk3_widgets[_GTK_SPIN_BUTTON_TYPE])) + if ((init_result = (NULL == gtk3_widgets[_GTK_SPIN_BUTTON_TYPE]))) { result = gtk3_widgets[_GTK_SPIN_BUTTON_TYPE] = (*fp_gtk_spin_button_new)(NULL, 0, 0); @@ -1221,7 +1221,7 @@ case TABBED_PANE_TAB_AREA: case TABBED_PANE_CONTENT: case TABBED_PANE_TAB: - if (init_result = (NULL == gtk3_widgets[_GTK_NOTEBOOK_TYPE])) + if ((init_result = (NULL == gtk3_widgets[_GTK_NOTEBOOK_TYPE]))) { gtk3_widgets[_GTK_NOTEBOOK_TYPE] = (*fp_gtk_notebook_new)(NULL); @@ -1229,7 +1229,7 @@ result = gtk3_widgets[_GTK_NOTEBOOK_TYPE]; break; case TOGGLE_BUTTON: - if (init_result = (NULL == gtk3_widgets[_GTK_TOGGLE_BUTTON_TYPE])) + if ((init_result = (NULL == gtk3_widgets[_GTK_TOGGLE_BUTTON_TYPE]))) { gtk3_widgets[_GTK_TOGGLE_BUTTON_TYPE] = (*fp_gtk_toggle_button_new)(NULL); @@ -1238,7 +1238,7 @@ break; case TOOL_BAR: case TOOL_BAR_DRAG_WINDOW: - if (init_result = (NULL == gtk3_widgets[_GTK_TOOLBAR_TYPE])) + if ((init_result = (NULL == gtk3_widgets[_GTK_TOOLBAR_TYPE]))) { gtk3_widgets[_GTK_TOOLBAR_TYPE] = (*fp_gtk_toolbar_new)(NULL); @@ -1246,8 +1246,8 @@ result = gtk3_widgets[_GTK_TOOLBAR_TYPE]; break; case TOOL_BAR_SEPARATOR: - if (init_result = - (NULL == gtk3_widgets[_GTK_SEPARATOR_TOOL_ITEM_TYPE])) + if ((init_result = + (NULL == gtk3_widgets[_GTK_SEPARATOR_TOOL_ITEM_TYPE]))) { gtk3_widgets[_GTK_SEPARATOR_TOOL_ITEM_TYPE] = (*fp_gtk_separator_tool_item_new)(); @@ -1255,7 +1255,7 @@ result = gtk3_widgets[_GTK_SEPARATOR_TOOL_ITEM_TYPE]; break; case VIEWPORT: - if (init_result = (NULL == gtk3_widgets[_GTK_VIEWPORT_TYPE])) + if ((init_result = (NULL == gtk3_widgets[_GTK_VIEWPORT_TYPE]))) { GtkAdjustment *adjustment = create_adjustment(); gtk3_widgets[_GTK_VIEWPORT_TYPE] = @@ -1268,7 +1268,7 @@ case VSCROLL_BAR_BUTTON_DOWN: case VSCROLL_BAR_TRACK: case VSCROLL_BAR_THUMB: - if (init_result = (NULL == gtk3_widgets[_GTK_VSCROLLBAR_TYPE])) + if ((init_result = (NULL == gtk3_widgets[_GTK_VSCROLLBAR_TYPE]))) { gtk3_widgets[_GTK_VSCROLLBAR_TYPE] = (*fp_gtk_vscrollbar_new)(create_adjustment()); @@ -1276,7 +1276,7 @@ result = gtk3_widgets[_GTK_VSCROLLBAR_TYPE]; break; case VSEPARATOR: - if (init_result = (NULL == gtk3_widgets[_GTK_VSEPARATOR_TYPE])) + if ((init_result = (NULL == gtk3_widgets[_GTK_VSEPARATOR_TYPE]))) { gtk3_widgets[_GTK_VSEPARATOR_TYPE] = (*fp_gtk_vseparator_new)(); @@ -1286,7 +1286,7 @@ case VSLIDER: case VSLIDER_THUMB: case VSLIDER_TRACK: - if (init_result = (NULL == gtk3_widgets[_GTK_VSCALE_TYPE])) + if ((init_result = (NULL == gtk3_widgets[_GTK_VSCALE_TYPE]))) { gtk3_widgets[_GTK_VSCALE_TYPE] = (*fp_gtk_scale_new)(GTK_ORIENTATION_VERTICAL, NULL); @@ -1300,7 +1300,7 @@ fp_gtk_range_set_inverted((GtkRange*)result, TRUE); break; case VSPLIT_PANE_DIVIDER: - if (init_result = (NULL == gtk3_widgets[_GTK_VPANED_TYPE])) + if ((init_result = (NULL == gtk3_widgets[_GTK_VPANED_TYPE]))) { gtk3_widgets[_GTK_VPANED_TYPE] = (*fp_gtk_vpaned_new)(); } @@ -2017,7 +2017,7 @@ /*************************************************/ static guint8 recode_color(gdouble channel) { - guint16 result = (guint16)(channel * 65535); + guint32 result = (guint32)(channel * 65535); if (result > 65535) { result = 65535; } --- old/src/java.desktop/unix/native/libawt_xawt/awt/multi_font.c 2018-11-26 16:07:34.901495181 +0530 +++ new/src/java.desktop/unix/native/libawt_xawt/awt/multi_font.c 2018-11-26 16:07:34.629631181 +0530 @@ -42,6 +42,10 @@ #include "awt_p.h" #include "multi_font.h" +#ifndef FONT_DEBUG +#define FONT_DEBUG 0 +#endif + extern XFontStruct *loadFont(Display *, char *, int32_t); extern struct FontIDs fontIDs; --- old/src/java.desktop/unix/native/libawt_xawt/awt/sun_awt_X11_GtkFileDialogPeer.c 2018-11-26 16:07:35.629131181 +0530 +++ new/src/java.desktop/unix/native/libawt_xawt/awt/sun_awt_X11_GtkFileDialogPeer.c 2018-11-26 16:07:35.357267181 +0530 @@ -79,8 +79,8 @@ static void quit(JNIEnv * env, jobject jpeer, gboolean isSignalHandler) { - jthrowable pendingException; - if (pendingException = (*env)->ExceptionOccurred(env)) { + jthrowable pendingException = (*env)->ExceptionOccurred(env); + if (pendingException) { (*env)->ExceptionClear(env); } --- old/src/java.desktop/unix/native/libawt_xawt/xawt/XToolkit.c 2018-11-26 16:07:36.352769181 +0530 +++ new/src/java.desktop/unix/native/libawt_xawt/xawt/XToolkit.c 2018-11-26 16:07:36.084903181 +0530 @@ -747,7 +747,8 @@ static void wakeUp() { static char wakeUp_char = 'p'; if (!isMainThread() && awt_pipe_inited) { - write ( AWT_WRITEPIPE, &wakeUp_char, 1 ); + ssize_t res = write ( AWT_WRITEPIPE, &wakeUp_char, 1 ); + (void)res; } } --- old/src/java.desktop/unix/native/libawt_xawt/xawt/XlibWrapper.c 2018-11-26 16:07:36.872509181 +0530 +++ new/src/java.desktop/unix/native/libawt_xawt/xawt/XlibWrapper.c 2018-11-26 16:07:36.616637181 +0530 @@ -2183,7 +2183,7 @@ JNIEXPORT jint JNICALL Java_sun_awt_X11_XlibWrapper_XSynchronize(JNIEnv *env, jclass clazz, jlong display, jboolean onoff) { - return (jint) XSynchronize((Display*)jlong_to_ptr(display), (onoff == JNI_TRUE ? True : False)); + return (jint) ((intptr_t)XSynchronize((Display*)jlong_to_ptr(display), (onoff == JNI_TRUE ? True : False))); } JNIEXPORT jboolean JNICALL @@ -2298,7 +2298,7 @@ return; } - pRect = (RECT_T *)SAFE_SIZE_ARRAY_ALLOC(malloc, worstBufferSize, sizeof(RECT_T)); + pRect = (RECT_T *)SAFE_SIZE_ARRAY_ALLOC(malloc, (jint)worstBufferSize, (int64_t)sizeof(RECT_T)); if (!pRect) { return; } --- old/src/java.desktop/unix/native/libawt_xawt/xawt/awt_Taskbar.c 2018-11-26 16:07:37.388251181 +0530 +++ new/src/java.desktop/unix/native/libawt_xawt/xawt/awt_Taskbar.c 2018-11-26 16:07:37.124383181 +0530 @@ -151,8 +151,8 @@ gtk->gdk_threads_enter(); fp_unity_launcher_entry_set_count(entry, value); fp_unity_launcher_entry_set_count_visible(entry, visible); - DbusmenuMenuitem* m; - if (m = fp_unity_launcher_entry_get_quicklist(entry)) { + DbusmenuMenuitem* m = fp_unity_launcher_entry_get_quicklist(entry); + if (m != NULL) { fp_unity_launcher_entry_set_quicklist(entry, m); } gtk->gdk_threads_leave(); @@ -167,8 +167,8 @@ (JNIEnv *env, jobject obj, jboolean urgent) { gtk->gdk_threads_enter(); fp_unity_launcher_entry_set_urgent(entry, urgent); - DbusmenuMenuitem* m; - if (m = fp_unity_launcher_entry_get_quicklist(entry)) { + DbusmenuMenuitem* m = fp_unity_launcher_entry_get_quicklist(entry); + if (m != NULL) { fp_unity_launcher_entry_set_quicklist(entry, m); } gtk->gdk_threads_leave(); @@ -184,8 +184,8 @@ gtk->gdk_threads_enter(); fp_unity_launcher_entry_set_progress(entry, value); fp_unity_launcher_entry_set_progress_visible(entry, visible); - DbusmenuMenuitem* m; - if (m = fp_unity_launcher_entry_get_quicklist(entry)) { + DbusmenuMenuitem* m = fp_unity_launcher_entry_get_quicklist(entry); + if (m != NULL) { fp_unity_launcher_entry_set_quicklist(entry, m); } gtk->gdk_threads_leave();