Fix style issues

This commit is contained in:
nyorain 2017-08-14 17:09:56 +02:00
parent 53052b3f6e
commit f998bb8299
14 changed files with 36 additions and 18 deletions

View File

@ -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);

View File

@ -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);

View File

@ -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;

View File

@ -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);

View File

@ -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);

View File

@ -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;
}

View File

@ -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:

View File

@ -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 {

View File

@ -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 {

View File

@ -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)) {

View File

@ -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 {

View File

@ -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 {

View File

@ -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);
}

View File

@ -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++) {