From f998bb82995c2086e05b0949bef76506740407f4 Mon Sep 17 00:00:00 2001 From: nyorain Date: Mon, 14 Aug 2017 17:09:56 +0200 Subject: [PATCH] Fix style issues --- backend/libinput/events.c | 2 +- backend/wayland/output.c | 2 +- backend/wayland/wl_seat.c | 2 +- include/wlr/types/wlr_region.h | 6 ++++-- include/wlr/util/list.h | 2 +- render/gles2/renderer.c | 5 +++-- types/wlr_input_device.c | 5 ++++- types/wlr_keyboard.c | 5 ++++- types/wlr_pointer.c | 5 ++++- types/wlr_surface.c | 6 +++--- types/wlr_tablet_pad.c | 5 ++++- types/wlr_touch.c | 5 ++++- util/list.c | 2 +- xcursor/wlr_cursor.c | 2 +- 14 files changed, 36 insertions(+), 18 deletions(-) diff --git a/backend/libinput/events.c b/backend/libinput/events.c index 0e434b7c..4288701d 100644 --- a/backend/libinput/events.c +++ b/backend/libinput/events.c @@ -120,7 +120,7 @@ static void handle_device_removed(struct wlr_libinput_backend *backend, if (!wlr_devices) { return; } - for (size_t i = 0; i < wlr_devices->length; i++) { + for (size_t i = 0; i < wlr_devices->length; i++) { struct wlr_input_device *wlr_dev = wlr_devices->items[i]; wl_signal_emit(&backend->backend.events.input_remove, wlr_dev); wlr_input_device_destroy(wlr_dev); diff --git a/backend/wayland/output.c b/backend/wayland/output.c index 767d1c6b..c0e93c41 100644 --- a/backend/wayland/output.c +++ b/backend/wayland/output.c @@ -66,7 +66,7 @@ static struct wlr_output_impl output_impl = { .swap_buffers = wlr_wl_output_swap_buffers, }; -void handle_ping(void* data, struct wl_shell_surface* ssurface, uint32_t serial) { +void handle_ping(void *data, struct wl_shell_surface *ssurface, uint32_t serial) { struct wlr_wl_backend_output *output = data; assert(output && output->shell_surface == ssurface); wl_shell_surface_pong(ssurface, serial); diff --git a/backend/wayland/wl_seat.c b/backend/wayland/wl_seat.c index 43e73dac..0ea1fd26 100644 --- a/backend/wayland/wl_seat.c +++ b/backend/wayland/wl_seat.c @@ -19,7 +19,7 @@ static void pointer_handle_enter(void *data, struct wl_pointer *wl_pointer, struct wlr_wl_input_device *wlr_wl_dev = (struct wlr_wl_input_device *)dev; assert(dev && dev->pointer); struct wlr_wl_pointer *wlr_wl_pointer = (struct wlr_wl_pointer *)dev->pointer; - struct wlr_wl_backend_output* output = + struct wlr_wl_backend_output *output = wlr_wl_output_for_surface(wlr_wl_dev->backend, surface); assert(output); wlr_wl_pointer->current_output = output; diff --git a/include/wlr/types/wlr_region.h b/include/wlr/types/wlr_region.h index 0aff48a3..9a64ac13 100644 --- a/include/wlr/types/wlr_region.h +++ b/include/wlr/types/wlr_region.h @@ -3,8 +3,10 @@ struct wl_resource; -// Implements the given resource as region. -// Sets the associated pixman_region32_t as userdata. +/* + * Implements the given resource as region. + * Sets the associated pixman_region32_t as userdata. + */ void wlr_region_create(struct wl_client *client, struct wl_resource *res, uint32_t id); diff --git a/include/wlr/util/list.h b/include/wlr/util/list.h index c82fbf7a..0c175132 100644 --- a/include/wlr/util/list.h +++ b/include/wlr/util/list.h @@ -11,7 +11,7 @@ typedef struct { list_t *list_create(void); void list_free(list_t *list); -void list_foreach(list_t *list, void (*callback)(void* item)); +void list_foreach(list_t *list, void (*callback)(void *item)); void list_add(list_t *list, void *item); void list_push(list_t *list, void *item); void list_insert(list_t *list, size_t index, void *item); diff --git a/render/gles2/renderer.c b/render/gles2/renderer.c index 75a47187..e63787d8 100644 --- a/render/gles2/renderer.c +++ b/render/gles2/renderer.c @@ -101,8 +101,9 @@ error: } static void init_image_ext() { - if (glEGLImageTargetTexture2DOES) + if (glEGLImageTargetTexture2DOES) { return; + } const char *exts = (const char*) glGetString(GL_EXTENSIONS); if (strstr(exts, "GL_OES_EGL_image_external")) { @@ -177,7 +178,7 @@ static void draw_quad() { static bool wlr_gles2_render_texture(struct wlr_renderer *_renderer, struct wlr_texture *texture, const float (*matrix)[16]) { - if(!texture || !texture->valid) { + if (!texture || !texture->valid) { wlr_log(L_ERROR, "attempt to render invalid texture"); return false; } diff --git a/types/wlr_input_device.c b/types/wlr_input_device.c index a8b264ac..409e8bd1 100644 --- a/types/wlr_input_device.c +++ b/types/wlr_input_device.c @@ -23,7 +23,10 @@ void wlr_input_device_init(struct wlr_input_device *dev, } void wlr_input_device_destroy(struct wlr_input_device *dev) { - if (!dev) return; + if (!dev) { + return; + } + if (dev->_device) { switch (dev->type) { case WLR_INPUT_DEVICE_KEYBOARD: diff --git a/types/wlr_keyboard.c b/types/wlr_keyboard.c index 14930f6f..faa2e669 100644 --- a/types/wlr_keyboard.c +++ b/types/wlr_keyboard.c @@ -11,7 +11,10 @@ void wlr_keyboard_init(struct wlr_keyboard *kb, } void wlr_keyboard_destroy(struct wlr_keyboard *kb) { - if (!kb) return; + if (!kb) { + return; + } + if (kb->impl && kb->impl->destroy) { kb->impl->destroy(kb); } else { diff --git a/types/wlr_pointer.c b/types/wlr_pointer.c index 02c2ce61..5cbc8cdf 100644 --- a/types/wlr_pointer.c +++ b/types/wlr_pointer.c @@ -14,7 +14,10 @@ void wlr_pointer_init(struct wlr_pointer *pointer, } void wlr_pointer_destroy(struct wlr_pointer *pointer) { - if (!pointer) return; + if (!pointer) { + return; + } + if (pointer->impl && pointer->impl->destroy) { pointer->impl->destroy(pointer); } else { diff --git a/types/wlr_surface.c b/types/wlr_surface.c index cc3b429d..3a12f3a6 100644 --- a/types/wlr_surface.c +++ b/types/wlr_surface.c @@ -27,8 +27,8 @@ static void surface_damage(struct wl_client *client, } surface->pending.invalid |= WLR_SURFACE_INVALID_SURFACE_DAMAGE; pixman_region32_union_rect(&surface->pending.surface_damage, - &surface->pending.surface_damage, - x, y, width, height); + &surface->pending.surface_damage, + x, y, width, height); } static void destroy_frame_callback(struct wl_resource *resource) { @@ -142,7 +142,7 @@ void wlr_surface_flush_damage(struct wlr_surface *surface) { for (int i = 0; i < n; ++i) { pixman_box32_t rect = rects[i]; if (!wlr_texture_update_shm(surface->texture, format, - rect.x1, rect.y1, + rect.x1, rect.y1, rect.x2 - rect.x1, rect.y2 - rect.y1, buffer)) { diff --git a/types/wlr_tablet_pad.c b/types/wlr_tablet_pad.c index b7f03493..dbe35e16 100644 --- a/types/wlr_tablet_pad.c +++ b/types/wlr_tablet_pad.c @@ -13,7 +13,10 @@ void wlr_tablet_pad_init(struct wlr_tablet_pad *pad, } void wlr_tablet_pad_destroy(struct wlr_tablet_pad *pad) { - if (!pad) return; + if (!pad) { + return; + } + if (pad->impl && pad->impl->destroy) { pad->impl->destroy(pad); } else { diff --git a/types/wlr_touch.c b/types/wlr_touch.c index 46ae7ce9..ae3beed0 100644 --- a/types/wlr_touch.c +++ b/types/wlr_touch.c @@ -14,7 +14,10 @@ void wlr_touch_init(struct wlr_touch *touch, } void wlr_touch_destroy(struct wlr_touch *touch) { - if (!touch) return; + if (!touch) { + return; + } + if (touch->impl && touch->impl->destroy) { touch->impl->destroy(touch); } else { diff --git a/util/list.c b/util/list.c index 94159036..e03c7498 100644 --- a/util/list.c +++ b/util/list.c @@ -74,7 +74,7 @@ void list_cat(list_t *list, list_t *source) { } } -void list_qsort(list_t* list, int compare(const void *left, const void *right)) { +void list_qsort(list_t *list, int compare(const void *left, const void *right)) { qsort(list->items, list->length, sizeof(void *), compare); } diff --git a/xcursor/wlr_cursor.c b/xcursor/wlr_cursor.c index 3a7da05b..85e0d3be 100644 --- a/xcursor/wlr_cursor.c +++ b/xcursor/wlr_cursor.c @@ -269,7 +269,7 @@ void wlr_cursor_theme_destroy(struct wlr_cursor_theme *theme) { } struct wlr_cursor *wlr_cursor_theme_get_cursor(struct wlr_cursor_theme *theme, - const char *name) { + const char *name) { unsigned int i; for (i = 0; i < theme->cursor_count; i++) {