fdo-mirrors/weston
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/weston.git synced 2026-05-08 13:38:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

launcher: Drop unecessary checks for drm_fd == -1

Browse source 
We never get into this case, and if we do, we just want to pass the invalid
fd through to the underlying ioctl and get the error that way."
This commit is contained in:
Kristian Høgsberg 2013-10-14 13:59:53 -07:00
parent 8541f27620
commit 60e0b78eec
1 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/launcher-util.c
View file

@ -69,25 +69,20 @@ struct weston_launcher {
static int
drm_drop_master(int drm_fd)
{
if (drm_fd != -1)
return drmDropMaster(drm_fd);
return -EBADF;
return drmDropMaster(drm_fd);
}
static int
drm_set_master(int drm_fd)
{
if (drm_fd != -1)
return drmSetMaster(drm_fd);
return -EBADF;
return drmSetMaster(drm_fd);
}
static int
drm_is_master(int drm_fd)
{
drm_magic_t magic;
if (drm_fd != -1)
return drmGetMagic(drm_fd, &magic) == 0 &&
drmAuthMagic(drm_fd, magic) == 0;
return 0;
return drmGetMagic(drm_fd, &magic) == 0 &&
drmAuthMagic(drm_fd, magic) == 0;
}
#else
static int drm_drop_master(int drm_fd) {return 0;}