e16
/
e16
3
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Fix some clang-analyzer complaints

This commit is contained in:
Kim Woelders 2022-09-18 13:31:05 +02:00
parent 845cbedaf7
commit 6c1fbaaedd
7 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/alert.c
View File

@ -379,7 +379,6 @@ ShowAlert(const char *title,
} }
XSync(dd, False); XSync(dd, False);
btn = 0;
button = 0; button = 0;
for (; button == 0;) for (; button == 0;)
{ {

2
src/arrange.c
View File

@ -716,6 +716,8 @@ ArrangeEwins(const char *params)
fixed = floating = ret = NULL; fixed = floating = ret = NULL;
ArrangeGetRectList(&fixed, &nfix, &floating, &nflt, NULL); ArrangeGetRectList(&fixed, &nfix, &floating, &nflt, NULL);
if (!floating)
goto done;
ret = ECALLOC(RectBox, nflt + nfix); ret = ECALLOC(RectBox, nflt + nfix);
if (!ret) if (!ret)

2
src/backgrounds.c
View File

@ -1996,7 +1996,7 @@ _DlgFillBackground(Dialog * d, DItem * table, void *data)
table2 = DialogAddItem(table, DITEM_TABLE); table2 = DialogAddItem(table, DITEM_TABLE);
DialogItemTableSetOptions(table2, 2, 0, 1, 0); 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); BG_DialogSetFileName(dd->bg_filename);
table3 = DialogAddItem(table2, DITEM_TABLE); table3 = DialogAddItem(table2, DITEM_TABLE);

28
src/eglx.c
View File

@ -195,30 +195,30 @@ EGlInit(void)
continue; continue;
#if 1 #if 1
value = FBCATTR(fbc[i], GLX_FBCONFIG_ID, -1); FBCATTR(fbc[i], GLX_FBCONFIG_ID, -1);
value = FBCATTR(fbc[i], GLX_CONFIG_CAVEAT, GLX_NONE); FBCATTR(fbc[i], GLX_CONFIG_CAVEAT, GLX_NONE);
value = FBCATTR(fbc[i], GLX_DRAWABLE_TYPE, GLX_PIXMAP_BIT); FBCATTR(fbc[i], GLX_DRAWABLE_TYPE, GLX_PIXMAP_BIT);
value = FBCATTR(fbc[i], GLX_RENDER_TYPE, -1); FBCATTR(fbc[i], GLX_RENDER_TYPE, -1);
value = FBCATTR(fbc[i], GLX_X_VISUAL_TYPE, -1); FBCATTR(fbc[i], GLX_X_VISUAL_TYPE, -1);
value = FBCATTR(fbc[i], GLX_X_RENDERABLE, -1); FBCATTR(fbc[i], GLX_X_RENDERABLE, -1);
value = FBCATTR(fbc[i], GLX_BUFFER_SIZE, -1); FBCATTR(fbc[i], GLX_BUFFER_SIZE, -1);
value = FBCATTR(fbc[i], GLX_LEVEL, -1); FBCATTR(fbc[i], GLX_LEVEL, -1);
value = FBCATTR(fbc[i], GLX_TRANSPARENT_TYPE, -1); FBCATTR(fbc[i], GLX_TRANSPARENT_TYPE, -1);
#endif #endif
#if 1 #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); value = FBCATTR(fbc[i], GLX_BIND_TO_TEXTURE_RGB_EXT, 1);
if (!value) if (!value)
continue; continue;
value = FBCATTR(fbc[i], GLX_BIND_TO_MIPMAP_TEXTURE_EXT, -1); FBCATTR(fbc[i], GLX_BIND_TO_MIPMAP_TEXTURE_EXT, -1);
value = FBCATTR(fbc[i], GLX_BIND_TO_TEXTURE_TARGETS_EXT, FBCATTR(fbc[i], GLX_BIND_TO_TEXTURE_TARGETS_EXT,
GLX_TEXTURE_2D_BIT_EXT); GLX_TEXTURE_2D_BIT_EXT);
#if 0 #if 0
if (!(value & GLX_TEXTURE_2D_BIT_EXT)) if (!(value & GLX_TEXTURE_2D_BIT_EXT))
continue; continue;
#endif #endif
value = FBCATTR(fbc[i], GLX_Y_INVERTED_EXT, -1); FBCATTR(fbc[i], GLX_Y_INVERTED_EXT, -1);
#endif #endif
#if 1 #if 1

4
src/glwin.c
View File

@ -441,6 +441,9 @@ SceneDraw(void)
t = GetDTime(); t = GetDTime();
ewins = GlwinEwins(&num); ewins = GlwinEwins(&num);
if (num <= 0)
goto done;
if (sel_ewin < 0) if (sel_ewin < 0)
sel_ewin = num - 1; sel_ewin = num - 1;
else if (sel_ewin >= num) else if (sel_ewin >= num)
@ -459,6 +462,7 @@ SceneDraw(void)
glXSwapBuffers(disp, EobjGetXwin(GLWin.eo)); glXSwapBuffers(disp, EobjGetXwin(GLWin.eo));
done:
Efree(ewins); Efree(ewins);
rot_x += speed_x; rot_x += speed_x;

2
src/menus.c
View File

@ -2015,7 +2015,7 @@ _DlgFillMenus(Dialog * d, DItem * table, void *data __UNUSED__)
DialogItemSetText(di, _("Warp pointer after moving menus")); DialogItemSetText(di, _("Warp pointer after moving menus"));
DialogItemCheckButtonSetPtr(di, &dd->warp); DialogItemCheckButtonSetPtr(di, &dd->warp);
di = label = DialogAddItem(table, DITEM_TEXT); label = DialogAddItem(table, DITEM_TEXT);
di = DialogAddItem(table, DITEM_SLIDER); di = DialogAddItem(table, DITEM_SLIDER);
DialogItemSliderSetBounds(di, 12, 48); DialogItemSliderSetBounds(di, 12, 48);

2
src/string.c
View File

@ -87,7 +87,7 @@ EnvSubst(const char *str, char *bptr, unsigned int blen)
p1 = strchr(si, '$'); p1 = strchr(si, '$');
if (!p1) if (!p1)
{ {
nw += snprintf(bptr + nw, blen - nw, "%s", si); snprintf(bptr + nw, blen - nw, "%s", si);
break; break;
} }
len = p1 - si; len = p1 - si;