mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't protect xkb_*_unref from NULL

Browse Source 
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>
This commit is contained in:
Ran Benita
2014-08-19 23:59:52 +03:00
committed by Daniel Stone
parent 2e1968fa1f
commit c9c74156cd
4 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/compositor-wayland.c
+1 -2
View File
@@ -1464,8 +1464,7 @@ input_handle_keymap(void *data, struct wl_keyboard *keyboard, uint32_t format,
else else
weston_seat_init_keyboard(&input->base, keymap); weston_seat_init_keyboard(&input->base, keymap);
if (keymap) xkb_keymap_unref(keymap);
xkb_keymap_unref(keymap);
return; return;
src/compositor-x11.c
+1 -2
View File
@@ -322,8 +322,7 @@ x11_input_create(struct x11_compositor *c, int no_input)
keymap = x11_compositor_get_keymap(c); keymap = x11_compositor_get_keymap(c);
if (weston_seat_init_keyboard(&c->core_seat, keymap) < 0) if (weston_seat_init_keyboard(&c->core_seat, keymap) < 0)
return -1; return -1;
if (keymap) xkb_keymap_unref(keymap);
xkb_keymap_unref(keymap);
x11_compositor_setup_xkb(c); x11_compositor_setup_xkb(c);
src/input.c
+3 -6
View File
@@ -544,12 +544,10 @@ weston_keyboard_destroy(struct weston_keyboard *keyboard)
#ifdef ENABLE_XKBCOMMON #ifdef ENABLE_XKBCOMMON
if (keyboard->seat->compositor->use_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) if (keyboard->xkb_info)
weston_xkb_info_destroy(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 #endif
@@ -1869,8 +1867,7 @@ weston_xkb_info_destroy(struct weston_xkb_info *xkb_info)
if (--xkb_info->ref_count > 0) if (--xkb_info->ref_count > 0)
return; return;
if (xkb_info->keymap) xkb_keymap_unref(xkb_info->keymap);
xkb_keymap_unref(xkb_info->keymap);
if (xkb_info->keymap_area) if (xkb_info->keymap_area)
munmap(xkb_info->keymap_area, xkb_info->keymap_size); munmap(xkb_info->keymap_area, xkb_info->keymap_size);
src/screen-share.c
+1 -2
View File
@@ -214,8 +214,7 @@ ss_seat_handle_keymap(void *data, struct wl_keyboard *keyboard,
else else
weston_seat_init_keyboard(&seat->base, keymap); weston_seat_init_keyboard(&seat->base, keymap);
if (keymap) xkb_keymap_unref(keymap);
xkb_keymap_unref(keymap);
return; return;