From dcc743047b903af8ba409ed25745f891234dc323 Mon Sep 17 00:00:00 2001 From: Johannes Schramm Date: Sun, 21 Jan 2018 16:28:21 +0100 Subject: style: include brackets for if/while/for, even if it's a single statement --- backend/session/logind.c | 4 +++- backend/session/session.c | 3 ++- backend/wayland/backend.c | 24 ++++++++++++++++++------ 3 files changed, 23 insertions(+), 8 deletions(-) (limited to 'backend') diff --git a/backend/session/logind.c b/backend/session/logind.c index 0b5b2a63..aa38b46c 100644 --- a/backend/session/logind.c +++ b/backend/session/logind.c @@ -330,7 +330,9 @@ static bool add_signal_matches(struct logind_session *session) { static int dbus_event(int fd, uint32_t mask, void *data) { sd_bus *bus = data; - while (sd_bus_process(bus, NULL) > 0); + while (sd_bus_process(bus, NULL) > 0) { + ; + } return 1; } diff --git a/backend/session/session.c b/backend/session/session.c index a5f17b8d..2bbbd4ef 100644 --- a/backend/session/session.c +++ b/backend/session/session.c @@ -307,8 +307,9 @@ size_t wlr_session_find_gpus(struct wlr_session *session, } const char *seat = udev_device_get_property_value(dev, "ID_SEAT"); - if (!seat) + if (!seat) { seat = "seat0"; + } if (session->seat[0] && strcmp(session->seat, seat) != 0) { udev_device_unref(dev); continue; diff --git a/backend/wayland/backend.c b/backend/wayland/backend.c index 32fdc2b6..f85498eb 100644 --- a/backend/wayland/backend.c +++ b/backend/wayland/backend.c @@ -85,12 +85,24 @@ static void wlr_wl_backend_destroy(struct wlr_backend *_backend) { wl_event_source_remove(backend->remote_display_src); wlr_egl_finish(&backend->egl); - if (backend->seat) wl_seat_destroy(backend->seat); - if (backend->shm) wl_shm_destroy(backend->shm); - if (backend->shell) zxdg_shell_v6_destroy(backend->shell); - if (backend->compositor) wl_compositor_destroy(backend->compositor); - if (backend->registry) wl_registry_destroy(backend->registry); - if (backend->remote_display) wl_display_disconnect(backend->remote_display); + if (backend->seat) { + wl_seat_destroy(backend->seat); + } + if (backend->shm) { + wl_shm_destroy(backend->shm); + } + if (backend->shell) { + zxdg_shell_v6_destroy(backend->shell); + } + if (backend->compositor) { + wl_compositor_destroy(backend->compositor); + } + if (backend->registry) { + wl_registry_destroy(backend->registry); + } + if (backend->remote_display) { + wl_display_disconnect(backend->remote_display); + } free(backend); } -- cgit v1.2.3 From e37ebf6869b653c91c27af706404d60b78ad0168 Mon Sep 17 00:00:00 2001 From: Johannes Schramm Date: Sun, 21 Jan 2018 17:00:15 +0100 Subject: style: add comment to empty while loop in logind.c --- backend/session/logind.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'backend') diff --git a/backend/session/logind.c b/backend/session/logind.c index aa38b46c..1ece051f 100644 --- a/backend/session/logind.c +++ b/backend/session/logind.c @@ -331,7 +331,7 @@ static bool add_signal_matches(struct logind_session *session) { static int dbus_event(int fd, uint32_t mask, void *data) { sd_bus *bus = data; while (sd_bus_process(bus, NULL) > 0) { - ; + // Do nothing. } return 1; } -- cgit v1.2.3 From 4478cf1ddc9109dd39ed447bdab854838a423e2a Mon Sep 17 00:00:00 2001 From: Timidger Date: Sun, 21 Jan 2018 14:57:24 -0500 Subject: Fixes #575 --- backend/drm/drm.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'backend') diff --git a/backend/drm/drm.c b/backend/drm/drm.c index 0d32605a..30eb1256 100644 --- a/backend/drm/drm.c +++ b/backend/drm/drm.c @@ -501,6 +501,9 @@ static bool wlr_drm_connector_set_cursor(struct wlr_output *output, struct wlr_drm_renderer *renderer = &drm->renderer; struct wlr_drm_crtc *crtc = conn->crtc; + if (!crtc) { + return false; + } struct wlr_drm_plane *plane = crtc->cursor; // We don't have a real cursor plane, so we make a fake one -- cgit v1.2.3 From 9d4ea146b66282e4cee6aedc8e0f27db3561d9a3 Mon Sep 17 00:00:00 2001 From: Timidger Date: Sun, 21 Jan 2018 15:37:23 -0500 Subject: Added crtc null check for other drm funcs --- backend/drm/drm.c | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'backend') diff --git a/backend/drm/drm.c b/backend/drm/drm.c index 30eb1256..c3cdd9f8 100644 --- a/backend/drm/drm.c +++ b/backend/drm/drm.c @@ -193,6 +193,9 @@ static void wlr_drm_connector_swap_buffers(struct wlr_output *output) { struct wlr_drm_backend *drm = (struct wlr_drm_backend *)output->backend; struct wlr_drm_crtc *crtc = conn->crtc; + if (!crtc) { + return; + } struct wlr_drm_plane *plane = crtc->primary; struct gbm_bo *bo = wlr_drm_surface_swap_buffers(&plane->surf); @@ -230,6 +233,9 @@ void wlr_drm_connector_start_renderer(struct wlr_drm_connector *conn) { struct wlr_drm_backend *drm = (struct wlr_drm_backend *)conn->output.backend; struct wlr_drm_crtc *crtc = conn->crtc; + if (!crtc) { + return; + } struct wlr_drm_plane *plane = crtc->primary; struct gbm_bo *bo = wlr_drm_surface_get_front( @@ -450,6 +456,9 @@ static bool wlr_drm_connector_set_mode(struct wlr_output *output, } struct wlr_drm_crtc *crtc = conn->crtc; + if (!crtc) { + return false; + } wlr_log(L_DEBUG, "%s: crtc=%ju ovr=%jd pri=%jd cur=%jd", conn->output.name, crtc - drm->crtcs, crtc->overlay ? crtc->overlay - drm->overlay_planes : -1, -- cgit v1.2.3 From f8b9f44ff53c25ad8feef1f2239b82c5e725c082 Mon Sep 17 00:00:00 2001 From: Timidger Date: Sun, 21 Jan 2018 15:47:02 -0500 Subject: Add con/crtc null check to move_cursor in drm --- backend/drm/drm.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'backend') diff --git a/backend/drm/drm.c b/backend/drm/drm.c index c3cdd9f8..47bd4e3a 100644 --- a/backend/drm/drm.c +++ b/backend/drm/drm.c @@ -634,6 +634,9 @@ static bool wlr_drm_connector_move_cursor(struct wlr_output *output, int x, int y) { struct wlr_drm_connector *conn = (struct wlr_drm_connector *)output; struct wlr_drm_backend *drm = (struct wlr_drm_backend *)output->backend; + if (!conn || !conn->crtc) { + return false; + } struct wlr_drm_plane *plane = conn->crtc->cursor; struct wlr_box box; -- cgit v1.2.3