From e0e96977b348772cac67282a6591d6c58eeaa927 Mon Sep 17 00:00:00 2001 From: Bert Münnich Date: Wed, 28 Oct 2015 20:59:48 +0100 Subject: Removed overcautious parameter checks --- window.c | 37 ------------------------------------- 1 file changed, 37 deletions(-) (limited to 'window.c') diff --git a/window.c b/window.c index ff7f116..ec6cc04 100644 --- a/window.c +++ b/window.c @@ -94,8 +94,6 @@ unsigned long win_alloc_color(win_t *win, const char *name) { XColor col; - if (win == NULL) - return 0UL; if (XAllocNamedColor(win->env.dpy, DefaultColormap(win->env.dpy, win->env.scr), name, &col, &col) == 0) @@ -142,9 +140,6 @@ void win_init(win_t *win) { win_env_t *e; - if (win == NULL) - return; - memset(win, 0, sizeof(win_t)); e = &win->env; @@ -199,9 +194,6 @@ void win_open(win_t *win) XSizeHints sizehints; Bool fullscreen = options->fullscreen && fs_support; - if (win == NULL) - return; - e = &win->env; sizehints.flags = PWinGravity; @@ -317,9 +309,6 @@ void win_open(win_t *win) void win_close(win_t *win) { - if (win == NULL || win->xwin == None) - return; - XFreeCursor(win->env.dpy, carrow); XFreeCursor(win->env.dpy, cnone); XFreeCursor(win->env.dpy, chand); @@ -335,9 +324,6 @@ bool win_configure(win_t *win, XConfigureEvent *c) { bool changed; - if (win == NULL || c == NULL) - return false; - changed = win->w != c->width || win->h + win->bar.h != c->height; win->x = c->x; @@ -354,9 +340,6 @@ void win_toggle_fullscreen(win_t *win) XEvent ev; XClientMessageEvent *cm; - if (win == NULL || win->xwin == None) - return; - if (!fs_support) { if (!fs_warned) { warn("window manager does not support fullscreen"); @@ -383,9 +366,6 @@ void win_toggle_fullscreen(win_t *win) void win_toggle_bar(win_t *win) { - if (win == NULL || win->xwin == None) - return; - if (win->bar.h != 0) { win->h += win->bar.h; win->bar.h = 0; @@ -399,9 +379,6 @@ void win_clear(win_t *win) { win_env_t *e; - if (win == NULL || win->xwin == None) - return; - e = &win->env; if (win->w > win->buf.w || win->h + win->bar.h > win->buf.h) { @@ -423,8 +400,6 @@ void win_draw_bar(win_t *win) win_env_t *e; win_bar_t *l, *r; - if (win == NULL || win->xwin == None) - return; if ((l = &win->bar.l)->buf == NULL || (r = &win->bar.r)->buf == NULL) return; @@ -473,9 +448,6 @@ void win_draw_bar(win_t *win) void win_draw(win_t *win) { - if (win == NULL || win->xwin == None) - return; - if (win->bar.h > 0) win_draw_bar(win); @@ -489,9 +461,6 @@ void win_draw_rect(win_t *win, int x, int y, int w, int h, bool fill, int lw, { XGCValues gcval; - if (win == NULL || win->buf.pm == None) - return; - gcval.line_width = lw; gcval.foreground = col; XChangeGC(win->env.dpy, gc, GCForeground | GCLineWidth, &gcval); @@ -517,9 +486,6 @@ int win_textwidth(const char *text, unsigned int len, bool with_padding) void win_set_title(win_t *win, const char *title) { - if (win == NULL || win->xwin == None) - return; - if (title == NULL) title = "sxiv"; @@ -536,9 +502,6 @@ void win_set_title(win_t *win, const char *title) void win_set_cursor(win_t *win, cursor_t cursor) { - if (win == NULL || win->xwin == None) - return; - switch (cursor) { case CURSOR_NONE: XDefineCursor(win->env.dpy, win->xwin, cnone); -- cgit v1.2.3-54-g00ecf