mirrors
/
sway
mirror of https://github.com/swaywm/sway.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't use asserts with side-effects

This commit is contained in:
Drew DeVault 2018-04-03 21:29:43 -04:00
parent 2605950769
commit d48e7036aa
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
swaybar/bar.c
View File

@ -299,7 +299,8 @@ void bar_setup(struct swaybar *bar,
bar->status = status_line_init(bar->config->status_command);
}
assert(bar->display = wl_display_connect(NULL));
bar->display = wl_display_connect(NULL);
assert(bar->display);
struct wl_registry *registry = wl_display_get_registry(bar->display);
wl_registry_add_listener(registry, &registry_listener, bar);
@ -317,14 +318,15 @@ void bar_setup(struct swaybar *bar,
}
}
assert(pointer->cursor_theme = wl_cursor_theme_load(
NULL, 16 * (max_scale * 2), bar->shm));
pointer->cursor_theme = wl_cursor_theme_load(
NULL, 16 * (max_scale * 2), bar->shm);
assert(pointer->cursor_theme);
struct wl_cursor *cursor;
assert(cursor = wl_cursor_theme_get_cursor(
pointer->cursor_theme, "left_ptr"));
cursor = wl_cursor_theme_get_cursor(pointer->cursor_theme, "left_ptr");
assert(cursor);
pointer->cursor_image = cursor->images[0];
assert(pointer->cursor_surface =
wl_compositor_create_surface(bar->compositor));
pointer->cursor_surface = wl_compositor_create_surface(bar->compositor);
assert(pointer->cursor_surface);
// TODO: we might not necessarily be meant to do all of the outputs
wl_list_for_each(output, &bar->outputs, link) {
@ -334,8 +336,8 @@ void bar_setup(struct swaybar *bar,
continue;
}
output->name = strdup(coutput->name);
assert(output->surface = wl_compositor_create_surface(
bar->compositor));
output->surface = wl_compositor_create_surface(bar->compositor);
assert(output->surface);
output->layer_surface = zwlr_layer_shell_v1_get_layer_surface(
bar->layer_shell, output->surface, output->output,
ZWLR_LAYER_SHELL_V1_LAYER_BOTTOM, "panel");