diff options
| -rw-r--r-- | src/launcher-util.c | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/src/launcher-util.c b/src/launcher-util.c index eac81b6..66af9dd 100644 --- a/src/launcher-util.c +++ b/src/launcher-util.c @@ -50,12 +50,8 @@ weston_launcher_open(struct weston_compositor *compositor, char *buf; ssize_t len; - fd = open(path, flags); - if (fd > 0) - return fd; - if (sock == -1) - return -1; + return open(path, flags); n = 1 + sizeof(int) + strlen(path) + 1; buf = malloc(n); @@ -117,15 +113,12 @@ weston_launcher_drm_set_master(struct weston_compositor *compositor, ssize_t len; char buf[2]; - if (master) - ret = drmSetMaster(drm_fd); - else - ret = drmDropMaster(drm_fd); - if (ret == 0) - return 0; - - if (compositor->launcher_sock == -1) - return -1; + if (compositor->launcher_sock == -1) { + if (master) + return drmSetMaster(drm_fd); + else + return drmDropMaster(drm_fd); + } memset(&msg, 0, sizeof msg); msg.msg_iov = &iov; |