diff options
| author | Drew DeVault <sir@cmpwn.com> | 2018-05-07 14:02:17 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-07 14:02:17 -0400 |
| commit | 8fa53df670e72f36bb80ef03a62acb10dbf97397 (patch) | |
| tree | 9503f4924f53d3eca0661a3c5c7e53c18a56f622 /swaybg | |
| parent | ef063953e816e7cbad6cfacb4d0dfc9a41c3d06b (diff) | |
| parent | a3ecfcfc2c709f1a3ebb548f30f9e7cc14cf26fa (diff) | |
Merge pull request #1933 from emersion/swaybg-asser-side-effects
swaybg: remove assertions with side-effects
Diffstat (limited to 'swaybg')
| -rw-r--r-- | swaybg/main.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/swaybg/main.c b/swaybg/main.c index 679b8c20..5b6c378c 100644 --- a/swaybg/main.c +++ b/swaybg/main.c @@ -113,7 +113,7 @@ static void layer_surface_closed(void *data, state->run_display = false; } -struct zwlr_layer_surface_v1_listener layer_surface_listener = { +static const struct zwlr_layer_surface_v1_listener layer_surface_listener = { .configure = layer_surface_configure, .closed = layer_surface_closed, }; @@ -141,7 +141,7 @@ static void output_scale(void *data, struct wl_output *output, int32_t factor) { } } -struct wl_output_listener output_listener = { +static const struct wl_output_listener output_listener = { .geometry = output_geometry, .mode = output_mode, .done = output_done, @@ -203,7 +203,8 @@ int main(int argc, const char **argv) { return 1; } - assert(state.display = wl_display_connect(NULL)); + state.display = wl_display_connect(NULL); + assert(state.display); struct wl_registry *registry = wl_display_get_registry(state.display); wl_registry_add_listener(registry, ®istry_listener, &state); @@ -213,9 +214,11 @@ int main(int argc, const char **argv) { // Second roundtrip to get output properties wl_display_roundtrip(state.display); - assert(state.surface = wl_compositor_create_surface(state.compositor)); + state.surface = wl_compositor_create_surface(state.compositor); + assert(state.surface); - assert(state.input_region = wl_compositor_create_region(state.compositor)); + state.input_region = wl_compositor_create_region(state.compositor); + assert(state.input_region); wl_surface_set_input_region(state.surface, state.input_region); state.layer_surface = zwlr_layer_shell_v1_get_layer_surface( |