From 6c1fbaaeddc7bd52675c7bc4f623073c8fabf8ae Mon Sep 17 00:00:00 2001
From: Kim Woelders <kim@woelders.dk>
Date: Sun, 18 Sep 2022 13:31:05 +0200
Subject: [PATCH] Fix some clang-analyzer complaints

---
 src/alert.c       |  1 -
 src/arrange.c     |  2 ++
 src/backgrounds.c |  2 +-
 src/eglx.c        | 28 ++++++++++++++--------------
 src/glwin.c       |  4 ++++
 src/menus.c       |  2 +-
 src/string.c      |  2 +-
 7 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/src/alert.c b/src/alert.c
index 154768af..5a185f3f 100644
--- a/src/alert.c
+++ b/src/alert.c
@@ -379,7 +379,6 @@ ShowAlert(const char *title,
      }
    XSync(dd, False);
 
-   btn = 0;
    button = 0;
    for (; button == 0;)
      {
diff --git a/src/arrange.c b/src/arrange.c
index 6e461221..36b0fce6 100644
--- a/src/arrange.c
+++ b/src/arrange.c
@@ -716,6 +716,8 @@ ArrangeEwins(const char *params)
    fixed = floating = ret = NULL;
 
    ArrangeGetRectList(&fixed, &nfix, &floating, &nflt, NULL);
+   if (!floating)
+      goto done;
 
    ret = ECALLOC(RectBox, nflt + nfix);
    if (!ret)
diff --git a/src/backgrounds.c b/src/backgrounds.c
index a426e6c7..80183b38 100644
--- a/src/backgrounds.c
+++ b/src/backgrounds.c
@@ -1996,7 +1996,7 @@ _DlgFillBackground(Dialog * d, DItem * table, void *data)
    table2 = DialogAddItem(table, DITEM_TABLE);
    DialogItemTableSetOptions(table2, 2, 0, 1, 0);
 
-   di = dd->bg_filename = DialogAddItem(table2, DITEM_TEXT);
+   dd->bg_filename = DialogAddItem(table2, DITEM_TEXT);
    BG_DialogSetFileName(dd->bg_filename);
 
    table3 = DialogAddItem(table2, DITEM_TABLE);
diff --git a/src/eglx.c b/src/eglx.c
index 6e72f931..84789a93 100644
--- a/src/eglx.c
+++ b/src/eglx.c
@@ -195,30 +195,30 @@ EGlInit(void)
 	   continue;
 
 #if 1
-	value = FBCATTR(fbc[i], GLX_FBCONFIG_ID, -1);
-	value = FBCATTR(fbc[i], GLX_CONFIG_CAVEAT, GLX_NONE);
-	value = FBCATTR(fbc[i], GLX_DRAWABLE_TYPE, GLX_PIXMAP_BIT);
-	value = FBCATTR(fbc[i], GLX_RENDER_TYPE, -1);
-	value = FBCATTR(fbc[i], GLX_X_VISUAL_TYPE, -1);
-	value = FBCATTR(fbc[i], GLX_X_RENDERABLE, -1);
-	value = FBCATTR(fbc[i], GLX_BUFFER_SIZE, -1);
-	value = FBCATTR(fbc[i], GLX_LEVEL, -1);
-	value = FBCATTR(fbc[i], GLX_TRANSPARENT_TYPE, -1);
+	FBCATTR(fbc[i], GLX_FBCONFIG_ID, -1);
+	FBCATTR(fbc[i], GLX_CONFIG_CAVEAT, GLX_NONE);
+	FBCATTR(fbc[i], GLX_DRAWABLE_TYPE, GLX_PIXMAP_BIT);
+	FBCATTR(fbc[i], GLX_RENDER_TYPE, -1);
+	FBCATTR(fbc[i], GLX_X_VISUAL_TYPE, -1);
+	FBCATTR(fbc[i], GLX_X_RENDERABLE, -1);
+	FBCATTR(fbc[i], GLX_BUFFER_SIZE, -1);
+	FBCATTR(fbc[i], GLX_LEVEL, -1);
+	FBCATTR(fbc[i], GLX_TRANSPARENT_TYPE, -1);
 #endif
 
 #if 1
-	value = FBCATTR(fbc[i], GLX_BIND_TO_TEXTURE_RGBA_EXT, 1);
+	FBCATTR(fbc[i], GLX_BIND_TO_TEXTURE_RGBA_EXT, 1);
 	value = FBCATTR(fbc[i], GLX_BIND_TO_TEXTURE_RGB_EXT, 1);
 	if (!value)
 	   continue;
-	value = FBCATTR(fbc[i], GLX_BIND_TO_MIPMAP_TEXTURE_EXT, -1);
-	value = FBCATTR(fbc[i], GLX_BIND_TO_TEXTURE_TARGETS_EXT,
-			GLX_TEXTURE_2D_BIT_EXT);
+	FBCATTR(fbc[i], GLX_BIND_TO_MIPMAP_TEXTURE_EXT, -1);
+	FBCATTR(fbc[i], GLX_BIND_TO_TEXTURE_TARGETS_EXT,
+		GLX_TEXTURE_2D_BIT_EXT);
 #if 0
 	if (!(value & GLX_TEXTURE_2D_BIT_EXT))
 	   continue;
 #endif
-	value = FBCATTR(fbc[i], GLX_Y_INVERTED_EXT, -1);
+	FBCATTR(fbc[i], GLX_Y_INVERTED_EXT, -1);
 #endif
 
 #if 1
diff --git a/src/glwin.c b/src/glwin.c
index c5c4388f..748720ab 100644
--- a/src/glwin.c
+++ b/src/glwin.c
@@ -441,6 +441,9 @@ SceneDraw(void)
    t = GetDTime();
 
    ewins = GlwinEwins(&num);
+   if (num <= 0)
+      goto done;
+
    if (sel_ewin < 0)
       sel_ewin = num - 1;
    else if (sel_ewin >= num)
@@ -459,6 +462,7 @@ SceneDraw(void)
 
    glXSwapBuffers(disp, EobjGetXwin(GLWin.eo));
 
+ done:
    Efree(ewins);
 
    rot_x += speed_x;
diff --git a/src/menus.c b/src/menus.c
index 669e3043..2eed1dfa 100644
--- a/src/menus.c
+++ b/src/menus.c
@@ -2015,7 +2015,7 @@ _DlgFillMenus(Dialog * d, DItem * table, void *data __UNUSED__)
    DialogItemSetText(di, _("Warp pointer after moving menus"));
    DialogItemCheckButtonSetPtr(di, &dd->warp);
 
-   di = label = DialogAddItem(table, DITEM_TEXT);
+   label = DialogAddItem(table, DITEM_TEXT);
 
    di = DialogAddItem(table, DITEM_SLIDER);
    DialogItemSliderSetBounds(di, 12, 48);
diff --git a/src/string.c b/src/string.c
index a9e5db80..8175f512 100644
--- a/src/string.c
+++ b/src/string.c
@@ -87,7 +87,7 @@ EnvSubst(const char *str, char *bptr, unsigned int blen)
 	p1 = strchr(si, '$');
 	if (!p1)
 	  {
-	     nw += snprintf(bptr + nw, blen - nw, "%s", si);
+	     snprintf(bptr + nw, blen - nw, "%s", si);
 	     break;
 	  }
 	len = p1 - si;