updated for version 7.4.342

Problem:    Clang gives warnings.
Solution:   Add an else block. (Dominique Pelle)

diff --git a/src/gui_beval.c b/src/gui_beval.c
index fe930f3faf60cd63630f3615a0456506f65ef78f..ae78456607c6f393eb0eb2bb733be58917f728f3 100644 (file)
--- a/src/gui_beval.c
+++ b/src/gui_beval.c
@@ -1193,11 +1193,13 @@ drawBalloon(beval)
            XmFontList fl;
 
            fl = gui_motif_fontset2fontlist(&gui.tooltip_fontset);
-           if (fl != NULL)
+           if (fl == NULL)
            {
-               XmStringExtent(fl, s, &w, &h);
-               XmFontListFree(fl);
+               XmStringFree(s);
+               return;
            }
+           XmStringExtent(fl, s, &w, &h);
+           XmFontListFree(fl);
        }
        w += gui.border_offset << 1;
        h += gui.border_offset << 1;

diff --git a/src/version.c b/src/version.c
index d6c1eb3a002dd8a292c3e9faac6ee52de5fab07c..3fdfae5497b767ce24bb7de73f10fe6b33fb4a2c 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    342,
 /**/
     341,
 /**/