--- old/make/lib/Awt2dLibraries.gmk 2016-06-23 12:14:23.944348768 +0530 +++ new/make/lib/Awt2dLibraries.gmk 2016-06-23 12:14:23.752348768 +0530 @@ -346,15 +346,34 @@ 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 # decimal constant is unsigned only in ISO C90 (JAVASE_EMBEDDED) BUILD_LIBAWT_XAWT_XToolkit.c_CFLAGS := -w - endif + + # Following files use macro from jdk/src/java.base/share/native/libjava/sizecalc.h + # These macros when used with 'unsigned int' result in 'type-limits' warning. + # These macros can be used with 'int' as well. + # Hence, warnings are suppressed from below files instead of changing the macros. + BUILD_LIBAWT_XAWT_gtk2_interface.c_CFLAGS := -Wno-type-limits + BUILD_LIBAWT_XAWT_gtk3_interface.c_CFLAGS := -Wno-type-limits + BUILD_LIBAWT_XAWT_XlibWrapper.c_CFLAGS := -Wno-type-limits + BUILD_LIBAWT_XAWT_fontpath.c_CFLAGS := -Wno-type-limits + + # Strings are constructed and populated using sprintf. + BUILD_LIBAWT_XAWT_OGLPaints.c_CFLAGS := -Wno-format-nonliteral + BUILD_LIBAWT_XAWT_OGLBufImgOps.c_CFLAGS := -Wno-format-nonliteral + endif + + ifeq ($(OPENJDK_TARGET_OS), solaris) + # function pointers are assigned void pointers + BUILD_LIBAWT_XAWT_awt_Taskbar.c_CFLAGS := -erroff=E_ASSIGNMENT_TYPE_MISMATCH + BUILD_LIBAWT_XAWT_gtk2_interface.c_CFLAGS := -erroff=E_ASSIGNMENT_TYPE_MISMATCH,E_NON_CONST_INIT + BUILD_LIBAWT_XAWT_gtk3_interface.c_CFLAGS := -erroff=E_ASSIGNMENT_TYPE_MISMATCH + endif + + # E_DECLARATION_IN_CODE warning from Solaris C compiler is suppressed as- + # There are places where the variables are declared after the validation checks(early returns) $(eval $(call SetupNativeCompilation,BUILD_LIBAWT_XAWT, \ LIBRARY := awt_xawt, \ @@ -365,11 +384,8 @@ CFLAGS := $(CFLAGS_JDKLIB) $(LIBAWT_XAWT_CFLAGS) \ $(X_CFLAGS), \ WARNINGS_AS_ERRORS_xlc := false, \ - DISABLED_WARNINGS_gcc := type-limits pointer-to-int-cast \ - deprecated-declarations unused-result maybe-uninitialized format \ - format-security int-to-pointer-cast parentheses, \ + DISABLED_WARNINGS_gcc := deprecated-declarations,\ DISABLED_WARNINGS_solstudio := E_DECLARATION_IN_CODE \ - E_ASSIGNMENT_TYPE_MISMATCH E_NON_CONST_INIT, \ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libawt_xawt/mapfile-vers, \ LDFLAGS := $(LDFLAGS_JDKLIB) \ $(call SET_SHARED_LIBRARY_ORIGIN) \ --- old/src/java.desktop/unix/native/common/awt/awt_Font.c 2016-06-23 12:14:24.400348768 +0530 +++ new/src/java.desktop/unix/native/common/awt/awt_Font.c 2016-06-23 12:14:24.220348768 +0530 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1995, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -638,7 +638,7 @@ /* XXX: sometimes XLoadQueryFont returns a bogus font structure */ /* with negative ascent. */ - if (xfont == (Font) NULL || xfont->ascent < 0) { + if (xfont == NULL || xfont->ascent < 0) { if (xfont != NULL) { XFreeFont(display, xfont); } @@ -709,7 +709,7 @@ Display *display = XDISPLAY; AWT_LOCK(); - fdata = (struct FontData *)pData; + fdata = (struct FontData *) jlong_to_ptr(pData); if (fdata == NULL) { AWT_UNLOCK(); --- old/src/java.desktop/unix/native/common/java2d/x11/X11PMBlitLoops.c 2016-06-23 12:14:24.868348768 +0530 +++ new/src/java.desktop/unix/native/common/java2d/x11/X11PMBlitLoops.c 2016-06-23 12:14:24.680348768 +0530 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -60,7 +60,7 @@ return; } - xgc = (GC)gc; + xgc = (GC) jlong_to_ptr(gc); if (xgc == NULL) { return; } @@ -151,7 +151,7 @@ return; } - dstGC = (GC)xgc; + dstGC = (GC) jlong_to_ptr(xgc); if (dstGC == NULL) { return; } --- old/src/java.desktop/unix/native/common/java2d/x11/X11Renderer.c 2016-06-23 12:14:25.336348768 +0530 +++ new/src/java.desktop/unix/native/common/java2d/x11/X11Renderer.c 2016-06-23 12:14:25.156348768 +0530 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -225,13 +225,13 @@ jint x1, jint y1, jint x2, jint y2) { #ifndef HEADLESS - X11SDOps *xsdo = (X11SDOps *) pXSData; + X11SDOps *xsdo = (X11SDOps *) jlong_to_ptr(pXSData); if (xsdo == NULL) { return; } - XDrawLine(awt_display, xsdo->drawable, (GC) xgc, + XDrawLine(awt_display, xsdo->drawable, (GC) jlong_to_ptr(xgc), CLAMP_TO_SHORT(x1), CLAMP_TO_SHORT(y1), CLAMP_TO_SHORT(x2), CLAMP_TO_SHORT(y2)); X11SD_DirectRenderNotify(env, xsdo); @@ -249,7 +249,7 @@ jint x, jint y, jint w, jint h) { #ifndef HEADLESS - X11SDOps *xsdo = (X11SDOps *) pXSData; + X11SDOps *xsdo = (X11SDOps *) jlong_to_ptr(pXSData); if (xsdo == NULL || w < 0 || h < 0) { return; @@ -263,11 +263,11 @@ * the anomalies of various X11 implementations that draw * nothing for degenerate Polygons and Rectangles. */ - XFillRectangle(awt_display, xsdo->drawable, (GC) xgc, + XFillRectangle(awt_display, xsdo->drawable, (GC) jlong_to_ptr(xgc), CLAMP_TO_SHORT(x), CLAMP_TO_SHORT(y), CLAMP_TO_USHORT(w+1), CLAMP_TO_USHORT(h+1)); } else { - XDrawRectangle(awt_display, xsdo->drawable, (GC) xgc, + XDrawRectangle(awt_display, xsdo->drawable, (GC) jlong_to_ptr(xgc), CLAMP_TO_SHORT(x), CLAMP_TO_SHORT(y), CLAMP_TO_USHORT(w), CLAMP_TO_USHORT(h)); } @@ -289,7 +289,7 @@ #ifndef HEADLESS long ty1, ty2, tx1, tx2, cx, cy, cxw, cyh, halfW, halfH, leftW, rightW, topH, bottomH; - X11SDOps *xsdo = (X11SDOps *) pXSData; + X11SDOps *xsdo = (X11SDOps *) jlong_to_ptr(pXSData); if (xsdo == NULL || w < 0 || h < 0) { return; @@ -334,32 +334,32 @@ topH = (ty1 - cy) * 2; bottomH = (cyh - ty2) * 2; - awt_drawArc(env, xsdo->drawable, (GC) xgc, + awt_drawArc(env, xsdo->drawable, (GC) jlong_to_ptr(xgc), cx, cy, leftW, topH, 90, 90, JNI_FALSE); - awt_drawArc(env, xsdo->drawable, (GC) xgc, + awt_drawArc(env, xsdo->drawable, (GC) jlong_to_ptr(xgc), cxw - rightW, cy, rightW, topH, 0, 90, JNI_FALSE); - awt_drawArc(env, xsdo->drawable, (GC) xgc, + awt_drawArc(env, xsdo->drawable, (GC) jlong_to_ptr(xgc), cx, cyh - bottomH, leftW, bottomH, 180, 90, JNI_FALSE); - awt_drawArc(env, xsdo->drawable, (GC) xgc, + awt_drawArc(env, xsdo->drawable, (GC) jlong_to_ptr(xgc), cxw - rightW, cyh - bottomH, rightW, bottomH, 270, 90, JNI_FALSE); if (tx1 <= tx2) { - XDrawLine(awt_display, xsdo->drawable, (GC) xgc, + XDrawLine(awt_display, xsdo->drawable, (GC) jlong_to_ptr(xgc), tx1, cy, tx2, cy); if (h > 0) { - XDrawLine(awt_display, xsdo->drawable, (GC) xgc, + XDrawLine(awt_display, xsdo->drawable, (GC) jlong_to_ptr(xgc), tx1, cyh, tx2, cyh); } } if (ty1 <= ty2) { - XDrawLine(awt_display, xsdo->drawable, (GC) xgc, + XDrawLine(awt_display, xsdo->drawable, (GC) jlong_to_ptr(xgc), cx, ty1, cx, ty2); if (w > 0) { - XDrawLine(awt_display, xsdo->drawable, (GC) xgc, + XDrawLine(awt_display, xsdo->drawable, (GC) jlong_to_ptr(xgc), cxw, ty1, cxw, ty2); } } @@ -378,7 +378,7 @@ jint x, jint y, jint w, jint h) { #ifndef HEADLESS - X11SDOps *xsdo = (X11SDOps *) pXSData; + X11SDOps *xsdo = (X11SDOps *) jlong_to_ptr(pXSData); if (xsdo == NULL) { return; @@ -393,11 +393,11 @@ * for speed and to deal better with degenerate sizes. */ if (w >= 0 && h >= 0) { - XFillRectangle(awt_display, xsdo->drawable, (GC) xgc, + XFillRectangle(awt_display, xsdo->drawable, (GC) jlong_to_ptr(xgc), x, y, w+1, h+1); } } else { - awt_drawArc(env, xsdo->drawable, (GC) xgc, + awt_drawArc(env, xsdo->drawable, (GC) jlong_to_ptr(xgc), x, y, w, h, 0, 360, JNI_FALSE); } X11SD_DirectRenderNotify(env, xsdo); @@ -416,13 +416,13 @@ jint angleStart, jint angleExtent) { #ifndef HEADLESS - X11SDOps *xsdo = (X11SDOps *) pXSData; + X11SDOps *xsdo = (X11SDOps *) jlong_to_ptr(pXSData); if (xsdo == NULL) { return; } - awt_drawArc(env, xsdo->drawable, (GC) xgc, + awt_drawArc(env, xsdo->drawable, (GC) jlong_to_ptr(xgc), x, y, w, h, angleStart, angleExtent, JNI_FALSE); X11SD_DirectRenderNotify(env, xsdo); #endif /* !HEADLESS */ @@ -442,7 +442,7 @@ { #ifndef HEADLESS XPoint pTmp[POLYTEMPSIZE], *points; - X11SDOps *xsdo = (X11SDOps *) pXSData; + X11SDOps *xsdo = (X11SDOps *) jlong_to_ptr(pXSData); if (xsdo == NULL) { return; @@ -476,11 +476,11 @@ * non-degenerate as this may invoke less processing * down the line than a Poly primitive anyway. */ - XDrawLine(awt_display, xsdo->drawable, (GC) xgc, + XDrawLine(awt_display, xsdo->drawable, (GC) jlong_to_ptr(xgc), points[0].x, points[0].y, points[1].x, points[1].y); } else { - XDrawLines(awt_display, xsdo->drawable, (GC) xgc, + XDrawLines(awt_display, xsdo->drawable, (GC) jlong_to_ptr(xgc), points, npoints, CoordModeOrigin); } if (points != pTmp) { @@ -569,7 +569,7 @@ jint transX, jint transY, jobject p2df, jboolean isFill) { #ifndef HEADLESS - X11SDOps *xsdo = (X11SDOps *) pXSData; + X11SDOps *xsdo = (X11SDOps *) jlong_to_ptr(pXSData); jarray typesArray; jobject pointArray; jarray coordsArray; @@ -609,7 +609,7 @@ return; } - XDHD_INIT(&dHData, (GC)xgc, xsdo->drawable); + XDHD_INIT(&dHData, (GC) jlong_to_ptr(xgc), xsdo->drawable); drawHandler.pData = &dHData; stroke = (((*env)->GetIntField(env, sg2d, sg2dStrokeHintID) == @@ -666,13 +666,13 @@ jint x, jint y, jint w, jint h) { #ifndef HEADLESS - X11SDOps *xsdo = (X11SDOps *) pXSData; + X11SDOps *xsdo = (X11SDOps *) jlong_to_ptr(pXSData); if (xsdo == NULL) { return; } - XFillRectangle(awt_display, xsdo->drawable, (GC) xgc, + XFillRectangle(awt_display, xsdo->drawable, (GC) jlong_to_ptr(xgc), CLAMP_TO_SHORT(x), CLAMP_TO_SHORT(y), CLAMP_TO_USHORT(w), CLAMP_TO_USHORT(h)); X11SD_DirectRenderNotify(env, xsdo); @@ -693,7 +693,7 @@ #ifndef HEADLESS long ty1, ty2, tx1, tx2, cx, cy, cxw, cyh, halfW, halfH, leftW, rightW, topH, bottomH; - X11SDOps *xsdo = (X11SDOps *) pXSData; + X11SDOps *xsdo = (X11SDOps *) jlong_to_ptr(pXSData); if (xsdo == NULL || w <= 0 || h <= 0) { return; @@ -738,31 +738,31 @@ topH = (ty1 - cy) * 2; bottomH = (cyh - ty2) * 2; - awt_drawArc(env, xsdo->drawable, (GC) xgc, + awt_drawArc(env, xsdo->drawable, (GC) jlong_to_ptr(xgc), cx, cy, leftW, topH, 90, 90, JNI_TRUE); - awt_drawArc(env, xsdo->drawable, (GC) xgc, + awt_drawArc(env, xsdo->drawable, (GC) jlong_to_ptr(xgc), cxw - rightW, cy, rightW, topH, 0, 90, JNI_TRUE); - awt_drawArc(env, xsdo->drawable, (GC) xgc, + awt_drawArc(env, xsdo->drawable, (GC) jlong_to_ptr(xgc), cx, cyh - bottomH, leftW, bottomH, 180, 90, JNI_TRUE); - awt_drawArc(env, xsdo->drawable, (GC) xgc, + awt_drawArc(env, xsdo->drawable, (GC) jlong_to_ptr(xgc), cxw - rightW, cyh - bottomH, rightW, bottomH, 270, 90, JNI_TRUE); if (tx1 < tx2) { if (cy < ty1) { - XFillRectangle(awt_display, xsdo->drawable, (GC) xgc, + XFillRectangle(awt_display, xsdo->drawable, (GC) jlong_to_ptr(xgc), tx1, cy, tx2 - tx1, ty1 - cy); } if (ty2 < cyh) { - XFillRectangle(awt_display, xsdo->drawable, (GC) xgc, + XFillRectangle(awt_display, xsdo->drawable, (GC) jlong_to_ptr(xgc), tx1, ty2, tx2 - tx1, cyh - ty2); } } if (ty1 < ty2) { - XFillRectangle(awt_display, xsdo->drawable, (GC) xgc, + XFillRectangle(awt_display, xsdo->drawable, (GC) jlong_to_ptr(xgc), cx, ty1, cxw - cx, ty2 - ty1); } X11SD_DirectRenderNotify(env, xsdo); @@ -780,7 +780,7 @@ jint x, jint y, jint w, jint h) { #ifndef HEADLESS - X11SDOps *xsdo = (X11SDOps *) pXSData; + X11SDOps *xsdo = (X11SDOps *) jlong_to_ptr(pXSData); if (xsdo == NULL) { return; @@ -820,10 +820,10 @@ } #undef SQRT_3_4 if (w > 0 && h > 0) { - XFillRectangle(awt_display, xsdo->drawable, (GC) xgc, x, y, w, h); + XFillRectangle(awt_display, xsdo->drawable, (GC) jlong_to_ptr(xgc), x, y, w, h); } } else { - awt_drawArc(env, xsdo->drawable, (GC) xgc, + awt_drawArc(env, xsdo->drawable, (GC) jlong_to_ptr(xgc), x, y, w, h, 0, 360, JNI_TRUE); } X11SD_DirectRenderNotify(env, xsdo); @@ -842,13 +842,13 @@ jint angleStart, jint angleExtent) { #ifndef HEADLESS - X11SDOps *xsdo = (X11SDOps *) pXSData; + X11SDOps *xsdo = (X11SDOps *) jlong_to_ptr(pXSData); if (xsdo == NULL) { return; } - awt_drawArc(env, xsdo->drawable, (GC) xgc, + awt_drawArc(env, xsdo->drawable, (GC) jlong_to_ptr(xgc), x, y, w, h, angleStart, angleExtent, JNI_TRUE); X11SD_DirectRenderNotify(env, xsdo); #endif /* !HEADLESS */ @@ -867,7 +867,7 @@ { #ifndef HEADLESS XPoint pTmp[POLYTEMPSIZE], *points; - X11SDOps *xsdo = (X11SDOps *) pXSData; + X11SDOps *xsdo = (X11SDOps *) jlong_to_ptr(pXSData); if (xsdo == NULL) { return; @@ -892,7 +892,7 @@ pTmp, (int *)&npoints, JNI_FALSE); if (points != 0) { if (npoints > 2) { - XFillPolygon(awt_display, xsdo->drawable, (GC) xgc, + XFillPolygon(awt_display, xsdo->drawable, (GC) jlong_to_ptr(xgc), points, npoints, Complex, CoordModeOrigin); X11SD_DirectRenderNotify(env, xsdo); } @@ -919,7 +919,7 @@ void *srData; jint x, y, w, h; jint spanbox[4]; - X11SDOps *xsdo = (X11SDOps *) pXSData; + X11SDOps *xsdo = (X11SDOps *) jlong_to_ptr(pXSData); if (xsdo == NULL) { return; @@ -940,7 +940,7 @@ y = spanbox[1] + transy; w = spanbox[2] - spanbox[0]; h = spanbox[3] - spanbox[1]; - XFillRectangle(awt_display, xsdo->drawable, (GC) xgc, + XFillRectangle(awt_display, xsdo->drawable, (GC) jlong_to_ptr(xgc), CLAMP_TO_SHORT(x), CLAMP_TO_SHORT(y), CLAMP_TO_USHORT(w), CLAMP_TO_USHORT(h)); } @@ -966,12 +966,12 @@ X11SDOps *xsdo; GC xgc; - xsdo = (X11SDOps *)jlong_to_ptr(xsd); + xsdo = (X11SDOps *) jlong_to_ptr(xsd); if (xsdo == NULL) { return; } - xgc = (GC)gc; + xgc = (GC) jlong_to_ptr(gc); if (xgc == NULL) { return; } --- old/src/java.desktop/unix/native/common/java2d/x11/X11SurfaceData.c 2016-06-23 12:14:25.812348768 +0530 +++ new/src/java.desktop/unix/native/common/java2d/x11/X11SurfaceData.c 2016-06-23 12:14:25.636348768 +0530 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -1549,13 +1549,13 @@ J2dTraceLn(J2D_TRACE_INFO, "in X11SurfaceData_XCreateGC"); - xsdo = (X11SDOps *) pXSData; + xsdo = (X11SDOps *) jlong_to_ptr(pXSData); if (xsdo == NULL) { return 0L; } xsdo->javaGC = XCreateGC(awt_display, xsdo->drawable, 0, NULL); - ret = (jlong) xsdo->javaGC; + ret = ptr_to_jlong(xsdo->javaGC); #else /* !HEADLESS */ ret = 0L; #endif /* !HEADLESS */ @@ -1574,7 +1574,7 @@ { #ifndef HEADLESS J2dTraceLn(J2D_TRACE_INFO, "in X11SurfaceData_XResetClip"); - XSetClipMask(awt_display, (GC) xgc, None); + XSetClipMask(awt_display, (GC) jlong_to_ptr(xgc), None); #endif /* !HEADLESS */ } @@ -1600,7 +1600,7 @@ x1, y1, x2, y2, complexclip, &pRect, 256); - XSetClipRectangles(awt_display, (GC) xgc, 0, 0, pRect, numrects, YXBanded); + XSetClipRectangles(awt_display, (GC) jlong_to_ptr(xgc), 0, 0, pRect, numrects, YXBanded); if (pRect != rects) { free(pRect); @@ -1619,7 +1619,7 @@ { #ifndef HEADLESS J2dTraceLn(J2D_TRACE_INFO, "in X11SurfaceData_XSetCopyMode"); - XSetFunction(awt_display, (GC) xgc, GXcopy); + XSetFunction(awt_display, (GC) jlong_to_ptr(xgc), GXcopy); #endif /* !HEADLESS */ } @@ -1634,7 +1634,7 @@ { #ifndef HEADLESS J2dTraceLn(J2D_TRACE_INFO, "in X11SurfaceData_XSetXorMode"); - XSetFunction(awt_display, (GC) xgc, GXxor); + XSetFunction(awt_display, (GC) jlong_to_ptr(xgc), GXxor); #endif /* !HEADLESS */ } @@ -1649,7 +1649,7 @@ { #ifndef HEADLESS J2dTraceLn(J2D_TRACE_INFO, "in X11SurfaceData_XSetForeground"); - XSetForeground(awt_display, (GC) xgc, pixel); + XSetForeground(awt_display, (GC) jlong_to_ptr(xgc), pixel); #endif /* !HEADLESS */ } @@ -1664,6 +1664,6 @@ { #ifndef HEADLESS J2dTraceLn(J2D_TRACE_INFO, "in X11SurfaceData_XSetGraphicsExposures"); - XSetGraphicsExposures(awt_display, (GC) xgc, needExposures ? True : False); + XSetGraphicsExposures(awt_display, (GC) jlong_to_ptr(xgc), needExposures ? True : False); #endif /* !HEADLESS */ } --- old/src/java.desktop/unix/native/common/java2d/x11/X11TextRenderer_md.c 2016-06-23 12:14:26.272348768 +0530 +++ new/src/java.desktop/unix/native/common/java2d/x11/X11TextRenderer_md.c 2016-06-23 12:14:26.092348768 +0530 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -222,7 +222,7 @@ return; } - xgc = (GC)gc; + xgc = (GC) jlong_to_ptr(gc); if (xgc == NULL) { return; } --- old/src/java.desktop/unix/native/libawt_xawt/awt/gtk2_interface.c 2016-06-23 12:14:26.740348768 +0530 +++ new/src/java.desktop/unix/native/libawt_xawt/awt/gtk2_interface.c 2016-06-23 12:14:26.548348768 +0530 @@ -768,8 +768,8 @@ */ gtk_modules_env = getenv ("GTK_MODULES"); - if (gtk_modules_env && strstr (gtk_modules_env, "atk-bridge") || - gtk_modules_env && strstr (gtk_modules_env, "gail")) + if ((gtk_modules_env && strstr (gtk_modules_env, "atk-bridge")) || + (gtk_modules_env && strstr (gtk_modules_env, "gail"))) { /* the new env will be smaller than the old one */ gchar *s, *new_env = SAFE_SIZE_STRUCT_ALLOC(malloc, @@ -783,7 +783,7 @@ /* strip out 'atk-bridge' and 'gail' */ size_t PREFIX_LENGTH = strlen(ENV_PREFIX); - while (s = strtok(tmp_env, ":")) + while ((s = strtok(tmp_env, ":"))) { if ((!strstr (s, "atk-bridge")) && (!strstr (s, "gail"))) { @@ -1099,8 +1099,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; @@ -1169,14 +1169,16 @@ { case BUTTON: case TABLE_HEADER: - if (init_result = (NULL == gtk2_widgets[_GTK_BUTTON_TYPE])) + init_result = (NULL == gtk2_widgets[_GTK_BUTTON_TYPE]); + if (init_result) { 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])) + init_result = (NULL == gtk2_widgets[_GTK_CHECK_BUTTON_TYPE]); + if (init_result) { gtk2_widgets[_GTK_CHECK_BUTTON_TYPE] = (*fp_gtk_check_button_new)(); @@ -1184,7 +1186,8 @@ result = gtk2_widgets[_GTK_CHECK_BUTTON_TYPE]; break; case CHECK_BOX_MENU_ITEM: - if (init_result = (NULL == gtk2_widgets[_GTK_CHECK_MENU_ITEM_TYPE])) + init_result = (NULL == gtk2_widgets[_GTK_CHECK_MENU_ITEM_TYPE]); + if (init_result) { gtk2_widgets[_GTK_CHECK_MENU_ITEM_TYPE] = (*fp_gtk_check_menu_item_new)(); @@ -1205,7 +1208,8 @@ result = gtk2_widgets[_GTK_COLOR_SELECTION_DIALOG_TYPE]; break;*/ case COMBO_BOX: - if (init_result = (NULL == gtk2_widgets[_GTK_COMBO_BOX_TYPE])) + init_result = (NULL == gtk2_widgets[_GTK_COMBO_BOX_TYPE]); + if (init_result) { gtk2_widgets[_GTK_COMBO_BOX_TYPE] = (*fp_gtk_combo_box_new)(); @@ -1213,8 +1217,9 @@ 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])) + init_result = + (NULL == gtk2_widgets[_GTK_COMBO_BOX_ARROW_BUTTON_TYPE]); + if (init_result) { gtk2_widgets[_GTK_COMBO_BOX_ARROW_BUTTON_TYPE] = (*fp_gtk_toggle_button_new)(); @@ -1222,8 +1227,9 @@ 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])) + init_result = + (NULL == gtk2_widgets[_GTK_COMBO_BOX_TEXT_FIELD_TYPE]); + if (init_result) { result = gtk2_widgets[_GTK_COMBO_BOX_TEXT_FIELD_TYPE] = (*fp_gtk_entry_new)(); @@ -1233,7 +1239,8 @@ case DESKTOP_ICON: case INTERNAL_FRAME_TITLE_PANE: case LABEL: - if (init_result = (NULL == gtk2_widgets[_GTK_LABEL_TYPE])) + init_result = (NULL == gtk2_widgets[_GTK_LABEL_TYPE]); + if (init_result) { gtk2_widgets[_GTK_LABEL_TYPE] = (*fp_gtk_label_new)(NULL); @@ -1243,7 +1250,8 @@ case DESKTOP_PANE: case PANEL: case ROOT_PANE: - if (init_result = (NULL == gtk2_widgets[_GTK_CONTAINER_TYPE])) + init_result = (NULL == gtk2_widgets[_GTK_CONTAINER_TYPE]); + if (init_result) { /* There is no constructor for a container type. I've * chosen GtkFixed container since it has a default @@ -1257,7 +1265,8 @@ case EDITOR_PANE: case TEXT_AREA: case TEXT_PANE: - if (init_result = (NULL == gtk2_widgets[_GTK_TEXT_VIEW_TYPE])) + init_result = (NULL == gtk2_widgets[_GTK_TEXT_VIEW_TYPE]); + if (init_result) { gtk2_widgets[_GTK_TEXT_VIEW_TYPE] = (*fp_gtk_text_view_new)(); @@ -1267,7 +1276,8 @@ case FORMATTED_TEXT_FIELD: case PASSWORD_FIELD: case TEXT_FIELD: - if (init_result = (NULL == gtk2_widgets[_GTK_ENTRY_TYPE])) + init_result = (NULL == gtk2_widgets[_GTK_ENTRY_TYPE]); + if (init_result) { gtk2_widgets[_GTK_ENTRY_TYPE] = (*fp_gtk_entry_new)(); @@ -1275,7 +1285,8 @@ result = gtk2_widgets[_GTK_ENTRY_TYPE]; break; case HANDLE_BOX: - if (init_result = (NULL == gtk2_widgets[_GTK_HANDLE_BOX_TYPE])) + init_result = (NULL == gtk2_widgets[_GTK_HANDLE_BOX_TYPE]); + if (init_result) { gtk2_widgets[_GTK_HANDLE_BOX_TYPE] = (*fp_gtk_handle_box_new)(); @@ -1287,7 +1298,8 @@ case HSCROLL_BAR_BUTTON_RIGHT: case HSCROLL_BAR_TRACK: case HSCROLL_BAR_THUMB: - if (init_result = (NULL == gtk2_widgets[_GTK_HSCROLLBAR_TYPE])) + init_result = (NULL == gtk2_widgets[_GTK_HSCROLLBAR_TYPE]); + if (init_result) { gtk2_widgets[_GTK_HSCROLLBAR_TYPE] = (*fp_gtk_hscrollbar_new)(create_adjustment()); @@ -1295,7 +1307,8 @@ result = gtk2_widgets[_GTK_HSCROLLBAR_TYPE]; break; case HSEPARATOR: - if (init_result = (NULL == gtk2_widgets[_GTK_HSEPARATOR_TYPE])) + init_result = (NULL == gtk2_widgets[_GTK_HSEPARATOR_TYPE]); + if (init_result) { gtk2_widgets[_GTK_HSEPARATOR_TYPE] = (*fp_gtk_hseparator_new)(); @@ -1305,7 +1318,8 @@ case HSLIDER: case HSLIDER_THUMB: case HSLIDER_TRACK: - if (init_result = (NULL == gtk2_widgets[_GTK_HSCALE_TYPE])) + init_result = (NULL == gtk2_widgets[_GTK_HSCALE_TYPE]); + if (init_result) { gtk2_widgets[_GTK_HSCALE_TYPE] = (*fp_gtk_hscale_new)(NULL); @@ -1314,21 +1328,24 @@ break; case HSPLIT_PANE_DIVIDER: case SPLIT_PANE: - if (init_result = (NULL == gtk2_widgets[_GTK_HPANED_TYPE])) + init_result = (NULL == gtk2_widgets[_GTK_HPANED_TYPE]); + if (init_result) { 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])) + init_result = (NULL == gtk2_widgets[_GTK_IMAGE_TYPE]); + if (init_result) { 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])) + init_result = (NULL == gtk2_widgets[_GTK_WINDOW_TYPE]); + if (init_result) { gtk2_widgets[_GTK_WINDOW_TYPE] = (*fp_gtk_window_new)(GTK_WINDOW_TOPLEVEL); @@ -1336,7 +1353,8 @@ result = gtk2_widgets[_GTK_WINDOW_TYPE]; break; case TOOL_TIP: - if (init_result = (NULL == gtk2_widgets[_GTK_TOOLTIP_TYPE])) + init_result = (NULL == gtk2_widgets[_GTK_TOOLTIP_TYPE]); + if (init_result) { result = (*fp_gtk_window_new)(GTK_WINDOW_TOPLEVEL); (*fp_gtk_widget_set_name)(result, "gtk-tooltips"); @@ -1348,7 +1366,8 @@ case TABLE: case TREE: case TREE_CELL: - if (init_result = (NULL == gtk2_widgets[_GTK_TREE_VIEW_TYPE])) + init_result = (NULL == gtk2_widgets[_GTK_TREE_VIEW_TYPE]); + if (init_result) { gtk2_widgets[_GTK_TREE_VIEW_TYPE] = (*fp_gtk_tree_view_new)(); @@ -1356,14 +1375,16 @@ result = gtk2_widgets[_GTK_TREE_VIEW_TYPE]; break; case TITLED_BORDER: - if (init_result = (NULL == gtk2_widgets[_GTK_FRAME_TYPE])) + init_result = (NULL == gtk2_widgets[_GTK_FRAME_TYPE]); + if (init_result) { 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])) + init_result = (NULL == gtk2_widgets[_GTK_MENU_TYPE]); + if (init_result) { gtk2_widgets[_GTK_MENU_TYPE] = (*fp_gtk_menu_new)(); @@ -1373,7 +1394,8 @@ case MENU: case MENU_ITEM: case MENU_ITEM_ACCELERATOR: - if (init_result = (NULL == gtk2_widgets[_GTK_MENU_ITEM_TYPE])) + init_result = (NULL == gtk2_widgets[_GTK_MENU_ITEM_TYPE]); + if (init_result) { gtk2_widgets[_GTK_MENU_ITEM_TYPE] = (*fp_gtk_menu_item_new)(); @@ -1381,7 +1403,8 @@ result = gtk2_widgets[_GTK_MENU_ITEM_TYPE]; break; case MENU_BAR: - if (init_result = (NULL == gtk2_widgets[_GTK_MENU_BAR_TYPE])) + init_result = (NULL == gtk2_widgets[_GTK_MENU_BAR_TYPE]); + if (init_result) { gtk2_widgets[_GTK_MENU_BAR_TYPE] = (*fp_gtk_menu_bar_new)(); @@ -1390,7 +1413,8 @@ break; case COLOR_CHOOSER: case OPTION_PANE: - if (init_result = (NULL == gtk2_widgets[_GTK_DIALOG_TYPE])) + init_result = (NULL == gtk2_widgets[_GTK_DIALOG_TYPE]); + if (init_result) { gtk2_widgets[_GTK_DIALOG_TYPE] = (*fp_gtk_dialog_new)(); @@ -1398,8 +1422,9 @@ result = gtk2_widgets[_GTK_DIALOG_TYPE]; break; case POPUP_MENU_SEPARATOR: - if (init_result = - (NULL == gtk2_widgets[_GTK_SEPARATOR_MENU_ITEM_TYPE])) + init_result = + (NULL == gtk2_widgets[_GTK_SEPARATOR_MENU_ITEM_TYPE]); + if (init_result) { gtk2_widgets[_GTK_SEPARATOR_MENU_ITEM_TYPE] = (*fp_gtk_separator_menu_item_new)(); @@ -1407,7 +1432,8 @@ result = gtk2_widgets[_GTK_SEPARATOR_MENU_ITEM_TYPE]; break; case HPROGRESS_BAR: - if (init_result = (NULL == gtk2_widgets[_GTK_HPROGRESS_BAR_TYPE])) + init_result = (NULL == gtk2_widgets[_GTK_HPROGRESS_BAR_TYPE]); + if (init_result) { gtk2_widgets[_GTK_HPROGRESS_BAR_TYPE] = (*fp_gtk_progress_bar_new)(); @@ -1415,7 +1441,8 @@ result = gtk2_widgets[_GTK_HPROGRESS_BAR_TYPE]; break; case VPROGRESS_BAR: - if (init_result = (NULL == gtk2_widgets[_GTK_VPROGRESS_BAR_TYPE])) + init_result = (NULL == gtk2_widgets[_GTK_VPROGRESS_BAR_TYPE]); + if (init_result) { gtk2_widgets[_GTK_VPROGRESS_BAR_TYPE] = (*fp_gtk_progress_bar_new)(); @@ -1430,7 +1457,8 @@ result = gtk2_widgets[_GTK_VPROGRESS_BAR_TYPE]; break; case RADIO_BUTTON: - if (init_result = (NULL == gtk2_widgets[_GTK_RADIO_BUTTON_TYPE])) + init_result = (NULL == gtk2_widgets[_GTK_RADIO_BUTTON_TYPE]); + if (init_result) { gtk2_widgets[_GTK_RADIO_BUTTON_TYPE] = (*fp_gtk_radio_button_new)(NULL); @@ -1438,8 +1466,9 @@ result = gtk2_widgets[_GTK_RADIO_BUTTON_TYPE]; break; case RADIO_BUTTON_MENU_ITEM: - if (init_result = - (NULL == gtk2_widgets[_GTK_RADIO_MENU_ITEM_TYPE])) + init_result = + (NULL == gtk2_widgets[_GTK_RADIO_MENU_ITEM_TYPE]); + if (init_result) { gtk2_widgets[_GTK_RADIO_MENU_ITEM_TYPE] = (*fp_gtk_radio_menu_item_new)(NULL); @@ -1447,8 +1476,9 @@ result = gtk2_widgets[_GTK_RADIO_MENU_ITEM_TYPE]; break; case SCROLL_PANE: - if (init_result = - (NULL == gtk2_widgets[_GTK_SCROLLED_WINDOW_TYPE])) + init_result = + (NULL == gtk2_widgets[_GTK_SCROLLED_WINDOW_TYPE]); + if (init_result) { gtk2_widgets[_GTK_SCROLLED_WINDOW_TYPE] = (*fp_gtk_scrolled_window_new)(NULL, NULL); @@ -1458,7 +1488,8 @@ case SPINNER: case SPINNER_ARROW_BUTTON: case SPINNER_TEXT_FIELD: - if (init_result = (NULL == gtk2_widgets[_GTK_SPIN_BUTTON_TYPE])) + init_result = (NULL == gtk2_widgets[_GTK_SPIN_BUTTON_TYPE]); + if (init_result) { result = gtk2_widgets[_GTK_SPIN_BUTTON_TYPE] = (*fp_gtk_spin_button_new)(NULL, 0, 0); @@ -1469,7 +1500,8 @@ case TABBED_PANE_TAB_AREA: case TABBED_PANE_CONTENT: case TABBED_PANE_TAB: - if (init_result = (NULL == gtk2_widgets[_GTK_NOTEBOOK_TYPE])) + init_result = (NULL == gtk2_widgets[_GTK_NOTEBOOK_TYPE]); + if (init_result) { gtk2_widgets[_GTK_NOTEBOOK_TYPE] = (*fp_gtk_notebook_new)(NULL); @@ -1477,7 +1509,8 @@ result = gtk2_widgets[_GTK_NOTEBOOK_TYPE]; break; case TOGGLE_BUTTON: - if (init_result = (NULL == gtk2_widgets[_GTK_TOGGLE_BUTTON_TYPE])) + init_result = (NULL == gtk2_widgets[_GTK_TOGGLE_BUTTON_TYPE]); + if (init_result) { gtk2_widgets[_GTK_TOGGLE_BUTTON_TYPE] = (*fp_gtk_toggle_button_new)(NULL); @@ -1486,7 +1519,8 @@ break; case TOOL_BAR: case TOOL_BAR_DRAG_WINDOW: - if (init_result = (NULL == gtk2_widgets[_GTK_TOOLBAR_TYPE])) + init_result = (NULL == gtk2_widgets[_GTK_TOOLBAR_TYPE]); + if (init_result) { gtk2_widgets[_GTK_TOOLBAR_TYPE] = (*fp_gtk_toolbar_new)(NULL); @@ -1494,8 +1528,9 @@ result = gtk2_widgets[_GTK_TOOLBAR_TYPE]; break; case TOOL_BAR_SEPARATOR: - if (init_result = - (NULL == gtk2_widgets[_GTK_SEPARATOR_TOOL_ITEM_TYPE])) + init_result = + (NULL == gtk2_widgets[_GTK_SEPARATOR_TOOL_ITEM_TYPE]); + if (init_result) { gtk2_widgets[_GTK_SEPARATOR_TOOL_ITEM_TYPE] = (*fp_gtk_separator_tool_item_new)(); @@ -1503,7 +1538,8 @@ result = gtk2_widgets[_GTK_SEPARATOR_TOOL_ITEM_TYPE]; break; case VIEWPORT: - if (init_result = (NULL == gtk2_widgets[_GTK_VIEWPORT_TYPE])) + init_result = (NULL == gtk2_widgets[_GTK_VIEWPORT_TYPE]); + if (init_result) { GtkAdjustment *adjustment = create_adjustment(); gtk2_widgets[_GTK_VIEWPORT_TYPE] = @@ -1516,7 +1552,8 @@ case VSCROLL_BAR_BUTTON_DOWN: case VSCROLL_BAR_TRACK: case VSCROLL_BAR_THUMB: - if (init_result = (NULL == gtk2_widgets[_GTK_VSCROLLBAR_TYPE])) + init_result = (NULL == gtk2_widgets[_GTK_VSCROLLBAR_TYPE]); + if (init_result) { gtk2_widgets[_GTK_VSCROLLBAR_TYPE] = (*fp_gtk_vscrollbar_new)(create_adjustment()); @@ -1524,7 +1561,8 @@ result = gtk2_widgets[_GTK_VSCROLLBAR_TYPE]; break; case VSEPARATOR: - if (init_result = (NULL == gtk2_widgets[_GTK_VSEPARATOR_TYPE])) + init_result = (NULL == gtk2_widgets[_GTK_VSEPARATOR_TYPE]); + if (init_result) { gtk2_widgets[_GTK_VSEPARATOR_TYPE] = (*fp_gtk_vseparator_new)(); @@ -1534,7 +1572,8 @@ case VSLIDER: case VSLIDER_THUMB: case VSLIDER_TRACK: - if (init_result = (NULL == gtk2_widgets[_GTK_VSCALE_TYPE])) + init_result = (NULL == gtk2_widgets[_GTK_VSCALE_TYPE]); + if (init_result) { gtk2_widgets[_GTK_VSCALE_TYPE] = (*fp_gtk_vscale_new)(NULL); @@ -1548,7 +1587,8 @@ ((GtkRange*)result)->inverted = 1; break; case VSPLIT_PANE_DIVIDER: - if (init_result = (NULL == gtk2_widgets[_GTK_VPANED_TYPE])) + init_result = (NULL == gtk2_widgets[_GTK_VPANED_TYPE]); + if (init_result) { gtk2_widgets[_GTK_VPANED_TYPE] = (*fp_gtk_vpaned_new)(); } @@ -2459,14 +2499,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 2016-06-23 12:14:27.244348768 +0530 +++ new/src/java.desktop/unix/native/libawt_xawt/awt/gtk3_interface.c 2016-06-23 12:14:27.052348768 +0530 @@ -563,8 +563,8 @@ * Strip the AT-SPI GTK_MODULEs if present */ gtk_modules_env = getenv ("GTK_MODULES"); - if (gtk_modules_env && strstr (gtk_modules_env, "atk-bridge") || - gtk_modules_env && strstr (gtk_modules_env, "gail")) + if ((gtk_modules_env && strstr (gtk_modules_env, "atk-bridge")) || + (gtk_modules_env && strstr (gtk_modules_env, "gail"))) { /* the new env will be smaller than the old one */ gchar *s, *new_env = SAFE_SIZE_STRUCT_ALLOC(malloc, @@ -578,7 +578,7 @@ /* strip out 'atk-bridge' and 'gail' */ size_t PREFIX_LENGTH = strlen(ENV_PREFIX); - while (s = strtok(tmp_env, ":")) + while ((s = strtok(tmp_env, ":"))) { if ((!strstr (s, "atk-bridge")) && (!strstr (s, "gail"))) { @@ -897,14 +897,16 @@ { case BUTTON: case TABLE_HEADER: - if (init_result = (NULL == gtk3_widgets[_GTK_BUTTON_TYPE])) + init_result = (NULL == gtk3_widgets[_GTK_BUTTON_TYPE]); + if (init_result) { 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])) + init_result = (NULL == gtk3_widgets[_GTK_CHECK_BUTTON_TYPE]); + if (init_result) { gtk3_widgets[_GTK_CHECK_BUTTON_TYPE] = (*fp_gtk_check_button_new)(); @@ -912,7 +914,8 @@ result = gtk3_widgets[_GTK_CHECK_BUTTON_TYPE]; break; case CHECK_BOX_MENU_ITEM: - if (init_result = (NULL == gtk3_widgets[_GTK_CHECK_MENU_ITEM_TYPE])) + init_result = (NULL == gtk3_widgets[_GTK_CHECK_MENU_ITEM_TYPE]); + if (init_result) { gtk3_widgets[_GTK_CHECK_MENU_ITEM_TYPE] = (*fp_gtk_check_menu_item_new)(); @@ -933,7 +936,8 @@ result = gtk3_widgets[_GTK_COLOR_SELECTION_DIALOG_TYPE]; break;*/ case COMBO_BOX: - if (init_result = (NULL == gtk3_widgets[_GTK_COMBO_BOX_TYPE])) + init_result = (NULL == gtk3_widgets[_GTK_COMBO_BOX_TYPE]); + if (init_result) { gtk3_widgets[_GTK_COMBO_BOX_TYPE] = (*fp_gtk_combo_box_new)(); @@ -941,8 +945,9 @@ 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])) + init_result = + (NULL == gtk3_widgets[_GTK_COMBO_BOX_ARROW_BUTTON_TYPE]); + if (init_result) { gtk3_widgets[_GTK_COMBO_BOX_ARROW_BUTTON_TYPE] = (*fp_gtk_toggle_button_new)(); @@ -950,8 +955,9 @@ 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])) + init_result = + (NULL == gtk3_widgets[_GTK_COMBO_BOX_TEXT_FIELD_TYPE]); + if (init_result) { result = gtk3_widgets[_GTK_COMBO_BOX_TEXT_FIELD_TYPE] = (*fp_gtk_entry_new)(); @@ -961,7 +967,8 @@ case DESKTOP_ICON: case INTERNAL_FRAME_TITLE_PANE: case LABEL: - if (init_result = (NULL == gtk3_widgets[_GTK_LABEL_TYPE])) + init_result = (NULL == gtk3_widgets[_GTK_LABEL_TYPE]); + if (init_result) { gtk3_widgets[_GTK_LABEL_TYPE] = (*fp_gtk_label_new)(NULL); @@ -971,7 +978,8 @@ case DESKTOP_PANE: case PANEL: case ROOT_PANE: - if (init_result = (NULL == gtk3_widgets[_GTK_CONTAINER_TYPE])) + init_result = (NULL == gtk3_widgets[_GTK_CONTAINER_TYPE]); + if (init_result) { /* There is no constructor for a container type. I've * chosen GtkFixed container since it has a default @@ -985,7 +993,8 @@ case EDITOR_PANE: case TEXT_AREA: case TEXT_PANE: - if (init_result = (NULL == gtk3_widgets[_GTK_TEXT_VIEW_TYPE])) + init_result = (NULL == gtk3_widgets[_GTK_TEXT_VIEW_TYPE]); + if (init_result) { gtk3_widgets[_GTK_TEXT_VIEW_TYPE] = (*fp_gtk_text_view_new)(); @@ -995,7 +1004,8 @@ case FORMATTED_TEXT_FIELD: case PASSWORD_FIELD: case TEXT_FIELD: - if (init_result = (NULL == gtk3_widgets[_GTK_ENTRY_TYPE])) + init_result = (NULL == gtk3_widgets[_GTK_ENTRY_TYPE]); + if (init_result) { gtk3_widgets[_GTK_ENTRY_TYPE] = (*fp_gtk_entry_new)(); @@ -1003,7 +1013,8 @@ result = gtk3_widgets[_GTK_ENTRY_TYPE]; break; case HANDLE_BOX: - if (init_result = (NULL == gtk3_widgets[_GTK_HANDLE_BOX_TYPE])) + init_result = (NULL == gtk3_widgets[_GTK_HANDLE_BOX_TYPE]); + if (init_result) { gtk3_widgets[_GTK_HANDLE_BOX_TYPE] = (*fp_gtk_handle_box_new)(); @@ -1015,7 +1026,8 @@ case HSCROLL_BAR_BUTTON_RIGHT: case HSCROLL_BAR_TRACK: case HSCROLL_BAR_THUMB: - if (init_result = (NULL == gtk3_widgets[_GTK_HSCROLLBAR_TYPE])) + init_result = (NULL == gtk3_widgets[_GTK_HSCROLLBAR_TYPE]); + if (init_result) { gtk3_widgets[_GTK_HSCROLLBAR_TYPE] = (*fp_gtk_hscrollbar_new)(create_adjustment()); @@ -1023,7 +1035,8 @@ result = gtk3_widgets[_GTK_HSCROLLBAR_TYPE]; break; case HSEPARATOR: - if (init_result = (NULL == gtk3_widgets[_GTK_HSEPARATOR_TYPE])) + init_result = (NULL == gtk3_widgets[_GTK_HSEPARATOR_TYPE]); + if (init_result) { gtk3_widgets[_GTK_HSEPARATOR_TYPE] = (*fp_gtk_hseparator_new)(); @@ -1033,7 +1046,8 @@ case HSLIDER: case HSLIDER_THUMB: case HSLIDER_TRACK: - if (init_result = (NULL == gtk3_widgets[_GTK_HSCALE_TYPE])) + init_result = (NULL == gtk3_widgets[_GTK_HSCALE_TYPE]); + if (init_result) { gtk3_widgets[_GTK_HSCALE_TYPE] = (*fp_gtk_scale_new)(GTK_ORIENTATION_HORIZONTAL, NULL); @@ -1042,21 +1056,24 @@ break; case HSPLIT_PANE_DIVIDER: case SPLIT_PANE: - if (init_result = (NULL == gtk3_widgets[_GTK_HPANED_TYPE])) + init_result = (NULL == gtk3_widgets[_GTK_HPANED_TYPE]); + if (init_result) { 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])) + init_result = (NULL == gtk3_widgets[_GTK_IMAGE_TYPE]); + if (init_result) { 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])) + init_result = (NULL == gtk3_widgets[_GTK_WINDOW_TYPE]); + if (init_result) { gtk3_widgets[_GTK_WINDOW_TYPE] = (*fp_gtk_window_new)(GTK_WINDOW_TOPLEVEL); @@ -1064,7 +1081,8 @@ result = gtk3_widgets[_GTK_WINDOW_TYPE]; break; case TOOL_TIP: - if (init_result = (NULL == gtk3_widgets[_GTK_TOOLTIP_TYPE])) + init_result = (NULL == gtk3_widgets[_GTK_TOOLTIP_TYPE]); + if (init_result) { result = (*fp_gtk_window_new)(GTK_WINDOW_TOPLEVEL); gtk3_widgets[_GTK_TOOLTIP_TYPE] = result; @@ -1075,7 +1093,8 @@ case TABLE: case TREE: case TREE_CELL: - if (init_result = (NULL == gtk3_widgets[_GTK_TREE_VIEW_TYPE])) + init_result = (NULL == gtk3_widgets[_GTK_TREE_VIEW_TYPE]); + if (init_result) { gtk3_widgets[_GTK_TREE_VIEW_TYPE] = (*fp_gtk_tree_view_new)(); @@ -1083,14 +1102,16 @@ result = gtk3_widgets[_GTK_TREE_VIEW_TYPE]; break; case TITLED_BORDER: - if (init_result = (NULL == gtk3_widgets[_GTK_FRAME_TYPE])) + init_result = (NULL == gtk3_widgets[_GTK_FRAME_TYPE]); + if (init_result) { 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])) + init_result = (NULL == gtk3_widgets[_GTK_MENU_TYPE]); + if (init_result) { gtk3_widgets[_GTK_MENU_TYPE] = (*fp_gtk_menu_new)(); @@ -1100,7 +1121,8 @@ case MENU: case MENU_ITEM: case MENU_ITEM_ACCELERATOR: - if (init_result = (NULL == gtk3_widgets[_GTK_MENU_ITEM_TYPE])) + init_result = (NULL == gtk3_widgets[_GTK_MENU_ITEM_TYPE]); + if (init_result) { gtk3_widgets[_GTK_MENU_ITEM_TYPE] = (*fp_gtk_menu_item_new)(); @@ -1108,7 +1130,8 @@ result = gtk3_widgets[_GTK_MENU_ITEM_TYPE]; break; case MENU_BAR: - if (init_result = (NULL == gtk3_widgets[_GTK_MENU_BAR_TYPE])) + init_result = (NULL == gtk3_widgets[_GTK_MENU_BAR_TYPE]); + if (init_result) { gtk3_widgets[_GTK_MENU_BAR_TYPE] = (*fp_gtk_menu_bar_new)(); @@ -1117,7 +1140,8 @@ break; case COLOR_CHOOSER: case OPTION_PANE: - if (init_result = (NULL == gtk3_widgets[_GTK_DIALOG_TYPE])) + init_result = (NULL == gtk3_widgets[_GTK_DIALOG_TYPE]); + if (init_result) { gtk3_widgets[_GTK_DIALOG_TYPE] = (*fp_gtk_dialog_new)(); @@ -1125,8 +1149,9 @@ result = gtk3_widgets[_GTK_DIALOG_TYPE]; break; case POPUP_MENU_SEPARATOR: - if (init_result = - (NULL == gtk3_widgets[_GTK_SEPARATOR_MENU_ITEM_TYPE])) + init_result = + (NULL == gtk3_widgets[_GTK_SEPARATOR_MENU_ITEM_TYPE]); + if (init_result) { gtk3_widgets[_GTK_SEPARATOR_MENU_ITEM_TYPE] = (*fp_gtk_separator_menu_item_new)(); @@ -1134,7 +1159,8 @@ result = gtk3_widgets[_GTK_SEPARATOR_MENU_ITEM_TYPE]; break; case HPROGRESS_BAR: - if (init_result = (NULL == gtk3_widgets[_GTK_HPROGRESS_BAR_TYPE])) + init_result = (NULL == gtk3_widgets[_GTK_HPROGRESS_BAR_TYPE]); + if (init_result) { gtk3_widgets[_GTK_HPROGRESS_BAR_TYPE] = (*fp_gtk_progress_bar_new)(); @@ -1142,7 +1168,8 @@ result = gtk3_widgets[_GTK_HPROGRESS_BAR_TYPE]; break; case VPROGRESS_BAR: - if (init_result = (NULL == gtk3_widgets[_GTK_VPROGRESS_BAR_TYPE])) + init_result = (NULL == gtk3_widgets[_GTK_VPROGRESS_BAR_TYPE]); + if (init_result) { gtk3_widgets[_GTK_VPROGRESS_BAR_TYPE] = (*fp_gtk_progress_bar_new)(); @@ -1157,7 +1184,8 @@ result = gtk3_widgets[_GTK_VPROGRESS_BAR_TYPE]; break; case RADIO_BUTTON: - if (init_result = (NULL == gtk3_widgets[_GTK_RADIO_BUTTON_TYPE])) + init_result = (NULL == gtk3_widgets[_GTK_RADIO_BUTTON_TYPE]); + if (init_result) { gtk3_widgets[_GTK_RADIO_BUTTON_TYPE] = (*fp_gtk_radio_button_new)(NULL); @@ -1165,8 +1193,9 @@ result = gtk3_widgets[_GTK_RADIO_BUTTON_TYPE]; break; case RADIO_BUTTON_MENU_ITEM: - if (init_result = - (NULL == gtk3_widgets[_GTK_RADIO_MENU_ITEM_TYPE])) + init_result = + (NULL == gtk3_widgets[_GTK_RADIO_MENU_ITEM_TYPE]); + if (init_result) { gtk3_widgets[_GTK_RADIO_MENU_ITEM_TYPE] = (*fp_gtk_radio_menu_item_new)(NULL); @@ -1174,8 +1203,9 @@ result = gtk3_widgets[_GTK_RADIO_MENU_ITEM_TYPE]; break; case SCROLL_PANE: - if (init_result = - (NULL == gtk3_widgets[_GTK_SCROLLED_WINDOW_TYPE])) + init_result = + (NULL == gtk3_widgets[_GTK_SCROLLED_WINDOW_TYPE]); + if (init_result) { gtk3_widgets[_GTK_SCROLLED_WINDOW_TYPE] = (*fp_gtk_scrolled_window_new)(NULL, NULL); @@ -1185,7 +1215,8 @@ case SPINNER: case SPINNER_ARROW_BUTTON: case SPINNER_TEXT_FIELD: - if (init_result = (NULL == gtk3_widgets[_GTK_SPIN_BUTTON_TYPE])) + init_result = (NULL == gtk3_widgets[_GTK_SPIN_BUTTON_TYPE]); + if (init_result) { result = gtk3_widgets[_GTK_SPIN_BUTTON_TYPE] = (*fp_gtk_spin_button_new)(NULL, 0, 0); @@ -1196,7 +1227,8 @@ case TABBED_PANE_TAB_AREA: case TABBED_PANE_CONTENT: case TABBED_PANE_TAB: - if (init_result = (NULL == gtk3_widgets[_GTK_NOTEBOOK_TYPE])) + init_result = (NULL == gtk3_widgets[_GTK_NOTEBOOK_TYPE]); + if (init_result) { gtk3_widgets[_GTK_NOTEBOOK_TYPE] = (*fp_gtk_notebook_new)(NULL); @@ -1204,7 +1236,8 @@ result = gtk3_widgets[_GTK_NOTEBOOK_TYPE]; break; case TOGGLE_BUTTON: - if (init_result = (NULL == gtk3_widgets[_GTK_TOGGLE_BUTTON_TYPE])) + init_result = (NULL == gtk3_widgets[_GTK_TOGGLE_BUTTON_TYPE]); + if (init_result) { gtk3_widgets[_GTK_TOGGLE_BUTTON_TYPE] = (*fp_gtk_toggle_button_new)(NULL); @@ -1213,7 +1246,8 @@ break; case TOOL_BAR: case TOOL_BAR_DRAG_WINDOW: - if (init_result = (NULL == gtk3_widgets[_GTK_TOOLBAR_TYPE])) + init_result = (NULL == gtk3_widgets[_GTK_TOOLBAR_TYPE]); + if (init_result) { gtk3_widgets[_GTK_TOOLBAR_TYPE] = (*fp_gtk_toolbar_new)(NULL); @@ -1221,8 +1255,9 @@ result = gtk3_widgets[_GTK_TOOLBAR_TYPE]; break; case TOOL_BAR_SEPARATOR: - if (init_result = - (NULL == gtk3_widgets[_GTK_SEPARATOR_TOOL_ITEM_TYPE])) + init_result = + (NULL == gtk3_widgets[_GTK_SEPARATOR_TOOL_ITEM_TYPE]); + if (init_result) { gtk3_widgets[_GTK_SEPARATOR_TOOL_ITEM_TYPE] = (*fp_gtk_separator_tool_item_new)(); @@ -1230,7 +1265,8 @@ result = gtk3_widgets[_GTK_SEPARATOR_TOOL_ITEM_TYPE]; break; case VIEWPORT: - if (init_result = (NULL == gtk3_widgets[_GTK_VIEWPORT_TYPE])) + init_result = (NULL == gtk3_widgets[_GTK_VIEWPORT_TYPE]); + if (init_result) { GtkAdjustment *adjustment = create_adjustment(); gtk3_widgets[_GTK_VIEWPORT_TYPE] = @@ -1243,7 +1279,8 @@ case VSCROLL_BAR_BUTTON_DOWN: case VSCROLL_BAR_TRACK: case VSCROLL_BAR_THUMB: - if (init_result = (NULL == gtk3_widgets[_GTK_VSCROLLBAR_TYPE])) + init_result = (NULL == gtk3_widgets[_GTK_VSCROLLBAR_TYPE]); + if (init_result) { gtk3_widgets[_GTK_VSCROLLBAR_TYPE] = (*fp_gtk_vscrollbar_new)(create_adjustment()); @@ -1251,7 +1288,8 @@ result = gtk3_widgets[_GTK_VSCROLLBAR_TYPE]; break; case VSEPARATOR: - if (init_result = (NULL == gtk3_widgets[_GTK_VSEPARATOR_TYPE])) + init_result = (NULL == gtk3_widgets[_GTK_VSEPARATOR_TYPE]); + if (init_result) { gtk3_widgets[_GTK_VSEPARATOR_TYPE] = (*fp_gtk_vseparator_new)(); @@ -1261,7 +1299,8 @@ case VSLIDER: case VSLIDER_THUMB: case VSLIDER_TRACK: - if (init_result = (NULL == gtk3_widgets[_GTK_VSCALE_TYPE])) + init_result = (NULL == gtk3_widgets[_GTK_VSCALE_TYPE]); + if (init_result) { gtk3_widgets[_GTK_VSCALE_TYPE] = (*fp_gtk_scale_new)(GTK_ORIENTATION_VERTICAL, NULL); @@ -1275,7 +1314,8 @@ fp_gtk_range_set_inverted((GtkRange*)result, TRUE); break; case VSPLIT_PANE_DIVIDER: - if (init_result = (NULL == gtk3_widgets[_GTK_VPANED_TYPE])) + init_result = (NULL == gtk3_widgets[_GTK_VPANED_TYPE]); + if (init_result) { gtk3_widgets[_GTK_VPANED_TYPE] = (*fp_gtk_vpaned_new)(); } @@ -1989,11 +2029,7 @@ static guint8 recode_color(gdouble channel) { guint16 result = (guint16)(channel * 65535); - if (result < 0) { - result = 0; - } else if (result > 65535) { - result = 65535; - } + return (guint8)( result >> 8); } --- old/src/java.desktop/unix/native/libawt_xawt/awt/list.c 2016-06-23 12:14:27.736348768 +0530 +++ new/src/java.desktop/unix/native/libawt_xawt/awt/list.c 2016-06-23 12:14:27.552348768 +0530 @@ -103,8 +103,9 @@ while (lp->next) { lp = lp->next; } - if ((lp->next = (list_ptr) malloc( sizeof( list_item))) == NULL) { - + + lp->next = (list_ptr) malloc(sizeof(list_item)); + if (lp->next == NULL) { return 0; } lp->next->ptr.item = item; @@ -122,7 +123,8 @@ { list_ptr lp; - if (lp = (list_ptr) malloc( sizeof( list_item))) { + lp = (list_ptr) malloc(sizeof(list_item)); + if (lp) { lp->next = NULL; lp->ptr.item = NULL; } --- old/src/java.desktop/unix/native/libawt_xawt/awt/sun_awt_X11_GtkFileDialogPeer.c 2016-06-23 12:14:28.284348768 +0530 +++ new/src/java.desktop/unix/native/libawt_xawt/awt/sun_awt_X11_GtkFileDialogPeer.c 2016-06-23 12:14:28.100348768 +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 2016-06-23 12:14:28.832348768 +0530 +++ new/src/java.desktop/unix/native/libawt_xawt/xawt/XToolkit.c 2016-06-23 12:14:28.652348768 +0530 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -580,7 +580,7 @@ */ static uint32_t get_poll_timeout(jlong nextTaskTime) { - uint32_t ret_timeout; + uint32_t ret_timeout = 0; uint32_t timeout; uint32_t taskTimeout; uint32_t flushTimeout; @@ -760,7 +760,7 @@ static void wakeUp() { static char wakeUp_char = 'p'; if (!isMainThread() && awt_pipe_inited) { - write ( AWT_WRITEPIPE, &wakeUp_char, 1 ); + size_t bytesWritten = write ( AWT_WRITEPIPE, &wakeUp_char, 1 ); //bytesWritten is unused } } --- old/src/java.desktop/unix/native/libawt_xawt/xawt/XWindow.c 2016-06-23 12:14:29.312348768 +0530 +++ new/src/java.desktop/unix/native/libawt_xawt/xawt/XWindow.c 2016-06-23 12:14:29.120348768 +0530 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -837,10 +837,10 @@ } static void dumpKeysymArray(XEvent *event) { - printf(" 0x%X\n",XKeycodeToKeysym(event->xkey.display, event->xkey.keycode, 0)); - printf(" 0x%X\n",XKeycodeToKeysym(event->xkey.display, event->xkey.keycode, 1)); - printf(" 0x%X\n",XKeycodeToKeysym(event->xkey.display, event->xkey.keycode, 2)); - printf(" 0x%X\n",XKeycodeToKeysym(event->xkey.display, event->xkey.keycode, 3)); + printf(" 0x%X\n", (unsigned int) XKeycodeToKeysym(event->xkey.display, event->xkey.keycode, 0)); + printf(" 0x%X\n", (unsigned int) XKeycodeToKeysym(event->xkey.display, event->xkey.keycode, 1)); + printf(" 0x%X\n", (unsigned int) XKeycodeToKeysym(event->xkey.display, event->xkey.keycode, 2)); + printf(" 0x%X\n", (unsigned int) XKeycodeToKeysym(event->xkey.display, event->xkey.keycode, 3)); } /* * In a next redesign, get rid of this code altogether. --- old/src/java.desktop/unix/native/libawt_xawt/xawt/XlibWrapper.c 2016-06-23 12:14:29.800348768 +0530 +++ new/src/java.desktop/unix/native/libawt_xawt/xawt/XlibWrapper.c 2016-06-23 12:14:29.600348768 +0530 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -573,9 +573,9 @@ (JNIEnv *env, jclass clazz, jlong display, jlong which, jlong device_spec) { AWT_CHECK_HAVE_LOCK_RETURN(0); - return (jlong) XkbGetMap( (Display *) jlong_to_ptr(display), + return ptr_to_jlong(XkbGetMap( (Display *) jlong_to_ptr(display), (unsigned int) which, - (unsigned int) device_spec); + (unsigned int) device_spec)); } JNIEXPORT jlong JNICALL Java_sun_awt_X11_XlibWrapper_XkbGetUpdatedMap (JNIEnv *env, jclass clazz, jlong display, jlong which, jlong xkb) @@ -596,7 +596,7 @@ { AWT_CHECK_HAVE_LOCK_RETURN(JNI_FALSE); Bool b; - b = XkbTranslateKeyCode((XkbDescPtr)xkb, (unsigned int)keycode, (unsigned int)mods, + b = XkbTranslateKeyCode((XkbDescPtr) jlong_to_ptr(xkb), (unsigned int)keycode, (unsigned int)mods, (unsigned int *)jlong_to_ptr(mods_rtrn), (KeySym *)jlong_to_ptr(keysym_rtrn)); //printf("native, input: keycode:0x%0X; mods:0x%0X\n", keycode, mods); @@ -2211,7 +2211,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 ptr_to_jlong(XSynchronize((Display*)jlong_to_ptr(display), (onoff == JNI_TRUE ? True : False))); } JNIEXPORT jboolean JNICALL --- old/src/java.desktop/unix/native/libawt_xawt/xawt/awt_Taskbar.c 2016-06-23 12:14:30.360348768 +0530 +++ new/src/java.desktop/unix/native/libawt_xawt/xawt/awt_Taskbar.c 2016-06-23 12:14:30.180348768 +0530 @@ -154,8 +154,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) { fp_unity_launcher_entry_set_quicklist(entry, m); } gtk->gdk_threads_leave(); @@ -170,8 +170,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) { fp_unity_launcher_entry_set_quicklist(entry, m); } gtk->gdk_threads_leave(); @@ -187,8 +187,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) { fp_unity_launcher_entry_set_quicklist(entry, m); } gtk->gdk_threads_leave();