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

weston-launcher: Fix uninitialized variable warning

Browse Source
This commit is contained in:
Kristian Høgsberg 2012-04-10 01:31:09 -04:00
parent 9e14091778
commit ba25bd7be1
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/launcher-util.c
View File

@ -68,6 +68,7 @@ weston_launcher_open(struct weston_compositor *compositor,
do { do {
len = send(sock, message, n, 0); len = send(sock, message, n, 0);
} while (len < 0 && errno == EINTR); } while (len < 0 && errno == EINTR);
free(message);
memset(&msg, 0, sizeof msg); memset(&msg, 0, sizeof msg);
iov.iov_base = &ret; iov.iov_base = &ret;
@ -83,14 +84,14 @@ weston_launcher_open(struct weston_compositor *compositor,
if (len != sizeof ret || if (len != sizeof ret ||
ret < 0) ret < 0)
goto out; return -1;
cmsg = CMSG_FIRSTHDR(&msg); cmsg = CMSG_FIRSTHDR(&msg);
if (!cmsg || if (!cmsg ||
cmsg->cmsg_level != SOL_SOCKET || cmsg->cmsg_level != SOL_SOCKET ||
cmsg->cmsg_type != SCM_RIGHTS) { cmsg->cmsg_type != SCM_RIGHTS) {
fprintf(stderr, "invalid control message\n"); fprintf(stderr, "invalid control message\n");
goto out; return -1;
} }
data = (union cmsg_data *) CMSG_DATA(cmsg); data = (union cmsg_data *) CMSG_DATA(cmsg);
@ -99,9 +100,7 @@ weston_launcher_open(struct weston_compositor *compositor,
return -1; return -1;
} }
out: return data->fd;
free(message);
return ret < 0 ? ret : data->fd;
} }
int int