Merge pull request #86 from nyorain/master

Fix style issues
This commit is contained in:
Drew DeVault 2017-08-15 07:18:22 -04:00 committed by GitHub
commit d2e796edb7
14 changed files with 24 additions and 22 deletions

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

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

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,8 +11,7 @@ void wlr_keyboard_init(struct wlr_keyboard *kb,
}
void wlr_keyboard_destroy(struct wlr_keyboard *kb) {
if (!kb) return;
if (kb->impl && kb->impl->destroy) {
if (kb && kb->impl && kb->impl->destroy) {
kb->impl->destroy(kb);
} else {
free(kb);

View File

@ -14,8 +14,7 @@ void wlr_pointer_init(struct wlr_pointer *pointer,
}
void wlr_pointer_destroy(struct wlr_pointer *pointer) {
if (!pointer) return;
if (pointer->impl && pointer->impl->destroy) {
if (pointer && pointer->impl && pointer->impl->destroy) {
pointer->impl->destroy(pointer);
} else {
free(pointer);

View File

@ -13,8 +13,7 @@ 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->impl && pad->impl->destroy) {
if (pad && pad->impl && pad->impl->destroy) {
pad->impl->destroy(pad);
} else {
free(pad);

View File

@ -14,8 +14,7 @@ void wlr_touch_init(struct wlr_touch *touch,
}
void wlr_touch_destroy(struct wlr_touch *touch) {
if (!touch) return;
if (touch->impl && touch->impl->destroy) {
if (touch && touch->impl && touch->impl->destroy) {
touch->impl->destroy(touch);
} else {
free(touch);