diff options
| author | Ran Benita <ran234@gmail.com> | 2014-08-19 23:59:52 +0300 |
|---|---|---|
| committer | Daniel Stone <daniels@collabora.com> | 2014-08-20 01:05:16 -0700 |
| commit | c9c74156cde72ba5fe772eb17b8db0edd8b3e2f2 (patch) | |
| tree | 320970c12d3473b8bb53cf1981c63669674cdb69 | |
| parent | 2e1968fa1f398e8615197378799ace0a4ea907dd (diff) | |
| download | weston-c9c74156cde72ba5fe772eb17b8db0edd8b3e2f2.tar.gz | |
Don't protect xkb_*_unref from NULL
Since xkbcommon-0.3.0, which is required by weston, a NULL argument
doesn't do anything.
Signed-off-by: Ran Benita <ran234@gmail.com>
| -rw-r--r-- | src/compositor-wayland.c | 3 | ||||
| -rw-r--r-- | src/compositor-x11.c | 3 | ||||
| -rw-r--r-- | src/input.c | 9 | ||||
| -rw-r--r-- | src/screen-share.c | 3 |
4 files changed, 6 insertions, 12 deletions
diff --git a/src/compositor-wayland.c b/src/compositor-wayland.c index 57e850f2..5f73c787 100644 --- a/src/compositor-wayland.c +++ b/src/compositor-wayland.c @@ -1464,8 +1464,7 @@ input_handle_keymap(void *data, struct wl_keyboard *keyboard, uint32_t format, else weston_seat_init_keyboard(&input->base, keymap); - if (keymap) - xkb_keymap_unref(keymap); + xkb_keymap_unref(keymap); return; diff --git a/src/compositor-x11.c b/src/compositor-x11.c index 984d7998..3494e34e 100644 --- a/src/compositor-x11.c +++ b/src/compositor-x11.c @@ -322,8 +322,7 @@ x11_input_create(struct x11_compositor *c, int no_input) keymap = x11_compositor_get_keymap(c); if (weston_seat_init_keyboard(&c->core_seat, keymap) < 0) return -1; - if (keymap) - xkb_keymap_unref(keymap); + xkb_keymap_unref(keymap); x11_compositor_setup_xkb(c); diff --git a/src/input.c b/src/input.c index 21307893..975cd775 100644 --- a/src/input.c +++ b/src/input.c @@ -544,12 +544,10 @@ weston_keyboard_destroy(struct weston_keyboard *keyboard) #ifdef ENABLE_XKBCOMMON if (keyboard->seat->compositor->use_xkbcommon) { - if (keyboard->xkb_state.state != NULL) - xkb_state_unref(keyboard->xkb_state.state); + xkb_state_unref(keyboard->xkb_state.state); if (keyboard->xkb_info) weston_xkb_info_destroy(keyboard->xkb_info); - if (keyboard->pending_keymap) - xkb_keymap_unref(keyboard->pending_keymap); + xkb_keymap_unref(keyboard->pending_keymap); } #endif @@ -1869,8 +1867,7 @@ weston_xkb_info_destroy(struct weston_xkb_info *xkb_info) if (--xkb_info->ref_count > 0) return; - if (xkb_info->keymap) - xkb_keymap_unref(xkb_info->keymap); + xkb_keymap_unref(xkb_info->keymap); if (xkb_info->keymap_area) munmap(xkb_info->keymap_area, xkb_info->keymap_size); diff --git a/src/screen-share.c b/src/screen-share.c index 9e81ef9c..524a0cac 100644 --- a/src/screen-share.c +++ b/src/screen-share.c @@ -214,8 +214,7 @@ ss_seat_handle_keymap(void *data, struct wl_keyboard *keyboard, else weston_seat_init_keyboard(&seat->base, keymap); - if (keymap) - xkb_keymap_unref(keymap); + xkb_keymap_unref(keymap); return; |