hiro/spectrwm
1
0
Fork 0
mirror of https://github.com/vale981/spectrwm synced 2025-03-05 09:51:38 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Address warnings found by static code code analysis

Browse source 
Warnings:
- unread variables
- shadowed declarations
- clarify calculations
- possible null pointer dereferences
This commit is contained in:
Björn Ketelaars 2019-11-22 21:01:20 +01:00 • committed by LordReg
parent 31b9f31828
commit 7c5196d990
2 changed files with 33 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/swm_hack.c
View file

@ -182,7 +182,7 @@ XCreateWindow(Display *dpy, Window parent, int x, int y, unsigned int width,
set_property(dpy, id, swmws, env); set_property(dpy, id, swmws, env);
if ((env = getenv("_SWM_PID")) != NULL) if ((env = getenv("_SWM_PID")) != NULL)
set_property(dpy, id, swmpid, env); set_property(dpy, id, swmpid, env);
if ((env = getenv("_SWM_XTERM_FONTADJ")) != NULL) { if (getenv("_SWM_XTERM_FONTADJ") != NULL) {
unsetenv("_SWM_XTERM_FONTADJ"); unsetenv("_SWM_XTERM_FONTADJ");
xterm = true; xterm = true;
} }
@ -221,7 +221,7 @@ XCreateSimpleWindow(Display *dpy, Window parent, int x, int y,
set_property(dpy, id, swmws, env); set_property(dpy, id, swmws, env);
if ((env = getenv("_SWM_PID")) != NULL) if ((env = getenv("_SWM_PID")) != NULL)
set_property(dpy, id, swmpid, env); set_property(dpy, id, swmpid, env);
if ((env = getenv("_SWM_XTERM_FONTADJ")) != NULL) { if (getenv("_SWM_XTERM_FONTADJ") != NULL) {
unsetenv("_SWM_XTERM_FONTADJ"); unsetenv("_SWM_XTERM_FONTADJ");
xterm = true; xterm = true;
} }

54
spectrwm.c
View file

@ -1694,22 +1694,22 @@ ewmh_autoquirk(struct ws_win *win)
void void
ewmh_update_actions(struct ws_win *win) ewmh_update_actions(struct ws_win *win)
{ {
xcb_atom_t actions[SWM_EWMH_ACTION_COUNT_MAX]; xcb_atom_t action[SWM_EWMH_ACTION_COUNT_MAX];
int n = 0; int n = 0;
if (win == NULL) if (win == NULL)
return; return;
actions[n++] = ewmh[_NET_WM_ACTION_CLOSE].atom; action[n++] = ewmh[_NET_WM_ACTION_CLOSE].atom;
if (ABOVE(win)) { if (ABOVE(win)) {
actions[n++] = ewmh[_NET_WM_ACTION_MOVE].atom; action[n++] = ewmh[_NET_WM_ACTION_MOVE].atom;
actions[n++] = ewmh[_NET_WM_ACTION_RESIZE].atom; action[n++] = ewmh[_NET_WM_ACTION_RESIZE].atom;
actions[n++] = ewmh[_NET_WM_ACTION_ABOVE].atom; action[n++] = ewmh[_NET_WM_ACTION_ABOVE].atom;
} }
xcb_change_property(conn, XCB_PROP_MODE_REPLACE, win->id, xcb_change_property(conn, XCB_PROP_MODE_REPLACE, win->id,
ewmh[_NET_WM_ALLOWED_ACTIONS].atom, XCB_ATOM_ATOM, 32, 1, actions); ewmh[_NET_WM_ALLOWED_ACTIONS].atom, XCB_ATOM_ATOM, 32, 1, action);
} }
#define _NET_WM_STATE_REMOVE 0 /* remove/unset property */ #define _NET_WM_STATE_REMOVE 0 /* remove/unset property */
@ -2011,18 +2011,17 @@ debug_refresh(struct ws_win *win)
XGlyphInfo info; XGlyphInfo info;
GC l_draw; GC l_draw;
XGCValues l_gcv; XGCValues l_gcv;
XRectangle l_ibox, l_lbox; XRectangle l_ibox, l_lbox = {0, 0, 0, 0};
xcb_rectangle_t rect; xcb_rectangle_t rect;
size_t len; size_t len;
uint32_t wc[4], mask, width, height, gcv[1]; uint32_t wc[4], mask, width, height, gcv[1];
int widx, sidx; int widx, sidx;
char *s; char *s;
xcb_screen_t *screen;
if (debug_enabled) { if (debug_enabled) {
/* Create debug window if it doesn't exist. */ /* Create debug window if it doesn't exist. */
if (win->debug == XCB_WINDOW_NONE) { if (win->debug == XCB_WINDOW_NONE) {
if ((screen = get_screen(win->s->idx)) == NULL) if (get_screen(win->s->idx) == NULL)
errx(1, "ERROR: can't get screen %d.", errx(1, "ERROR: can't get screen %d.",
win->s->idx); win->s->idx);
@ -2339,7 +2338,7 @@ socket_setnonblock(int fd)
if ((flags = fcntl(fd, F_GETFL, 0)) == -1) if ((flags = fcntl(fd, F_GETFL, 0)) == -1)
err(1, "fcntl F_GETFL"); err(1, "fcntl F_GETFL");
flags |= O_NONBLOCK; flags |= O_NONBLOCK;
if ((flags = fcntl(fd, F_SETFL, flags)) == -1) if (fcntl(fd, F_SETFL, flags) == -1)
err(1, "fcntl F_SETFL"); err(1, "fcntl F_SETFL");
} }
@ -3246,7 +3245,7 @@ bar_parse_markup(struct bar_section *sect)
XRectangle ibox, lbox; XRectangle ibox, lbox;
XGlyphInfo info; XGlyphInfo info;
int i = 0, len = 0, stop = 0; int i = 0, len = 0, stop = 0;
int index, prevfont; int idx, prevfont;
char *fmt; char *fmt;
unsigned char *u1, *u2; unsigned char *u1, *u2;
struct text_fragment *frag; struct text_fragment *frag;
@ -3342,13 +3341,13 @@ bar_parse_markup(struct bar_section *sect)
frag[i].bg = frag[i-1].bg; frag[i].bg = frag[i-1].bg;
len = 0; len = 0;
} }
index = *(fmt+5) - '0'; idx = *(fmt+5) - '0';
if ((*(fmt+2) == 'f') && (*(fmt+3) == 'n')) if ((*(fmt+2) == 'f') && (*(fmt+3) == 'n'))
frag[i].font = index; frag[i].font = idx;
else if ((*(fmt+2) == 'f') && (*(fmt+3) == 'g')) else if ((*(fmt+2) == 'f') && (*(fmt+3) == 'g'))
frag[i].fg = index; frag[i].fg = idx;
else if ((*(fmt+2) == 'b') && (*(fmt+3) == 'g')) else if ((*(fmt+2) == 'b') && (*(fmt+3) == 'g'))
frag[i].bg = index; frag[i].bg = idx;
else if ((*(fmt+2) == 's') && (*(fmt+3) == 't') else if ((*(fmt+2) == 's') && (*(fmt+3) == 't')
&& (*(fmt+4) == 'p')) && (*(fmt+4) == 'p'))
stop = 1; stop = 1;
@ -3737,12 +3736,11 @@ xft_init(struct swm_region *r)
void void
bar_setup(struct swm_region *r) bar_setup(struct swm_region *r)
{ {
xcb_screen_t *screen;
uint32_t wa[4]; uint32_t wa[4];
DNPRINTF(SWM_D_BAR, "screen %d.\n", r->s->idx); DNPRINTF(SWM_D_BAR, "screen %d.\n", r->s->idx);
if ((screen = get_screen(r->s->idx)) == NULL) if (get_screen(r->s->idx) == NULL)
errx(1, "ERROR: can't get screen %d.", r->s->idx); errx(1, "ERROR: can't get screen %d.", r->s->idx);
if (r->bar != NULL) if (r->bar != NULL)
@ -7441,10 +7439,10 @@ region_containment(struct ws_win *win, struct swm_region *r, int opts)
* side of the region boundary. Positive values indicate the side of * side of the region boundary. Positive values indicate the side of
* the window has passed beyond the region boundary. * the window has passed beyond the region boundary.
*/ */
rt = opts & SWM_CW_RIGHT ? MAX_X(win) - MAX_X(r) : bw; rt = (opts & SWM_CW_RIGHT) ? MAX_X(win) - MAX_X(r) : bw;
lt = opts & SWM_CW_LEFT ? X(r) - X(win) : bw; lt = (opts & SWM_CW_LEFT) ? X(r) - X(win) : bw;
bm = opts & SWM_CW_BOTTOM ? MAX_Y(win) - MAX_Y(r) : bw; bm = (opts & SWM_CW_BOTTOM) ? MAX_Y(win) - MAX_Y(r) : bw;
tp = opts & SWM_CW_TOP ? Y(r) - Y(win) : bw; tp = (opts & SWM_CW_TOP) ? Y(r) - Y(win) : bw;
DNPRINTF(SWM_D_MISC, "win %#x, rt: %d, lt: %d, bm: %d, tp: %d, " DNPRINTF(SWM_D_MISC, "win %#x, rt: %d, lt: %d, bm: %d, tp: %d, "
"SOFTBOUNDARY: %s, HARDBOUNDARY: %s\n", win->id, rt, lt, bm, tp, "SOFTBOUNDARY: %s, HARDBOUNDARY: %s\n", win->id, rt, lt, bm, tp,
@ -8605,7 +8603,12 @@ spawn_insert(const char *name, const char *args, int flags)
sp->flags = flags; sp->flags = flags;
DNPRINTF(SWM_D_SPAWN, "arg %d: [%s]\n", sp->argc, sp->argv[sp->argc-1]); #ifdef SWM_DEBUG
if (sp->argv != NULL) {
DNPRINTF(SWM_D_SPAWN, "arg %d: [%s]\n", sp->argc,
sp->argv[sp->argc-1]);
}
#endif
TAILQ_INSERT_TAIL(&spawns, sp, entry); TAILQ_INSERT_TAIL(&spawns, sp, entry);
DNPRINTF(SWM_D_SPAWN, "leave\n"); DNPRINTF(SWM_D_SPAWN, "leave\n");
} }
@ -8932,7 +8935,12 @@ setbinding(uint16_t mod, enum binding_type type, uint32_t val,
{ {
struct binding *bp; struct binding *bp;
DNPRINTF(SWM_D_KEY, "enter %s [%s]\n", actions[aid].name, spawn_name); #ifdef SWM_DEBUG
if (spawn_name != NULL) {
DNPRINTF(SWM_D_KEY, "enter %s [%s]\n", actions[aid].name,
spawn_name);
}
#endif
/* Unbind any existing. Loop is to handle MOD_MASK_ANY. */ /* Unbind any existing. Loop is to handle MOD_MASK_ANY. */
while ((bp = binding_lookup(mod, type, val))) while ((bp = binding_lookup(mod, type, val)))