Merge "liblog: use SOCK_NONBLOCK directly." am: fca43d3ec5 am: 33f8c194f9

am: 694b4880d8

Change-Id: I5e0fe80e9178978fa1760dfb90b9767667faeca3
This commit is contained in:
Elliott Hughes 2016-08-23 01:24:24 +00:00 committed by android-build-merger
commit 5ac94687b5

View file

@ -67,12 +67,9 @@ static int logdOpen()
int i, ret = 0;
if (logdLoggerWrite.context.sock < 0) {
i = TEMP_FAILURE_RETRY(socket(PF_UNIX, SOCK_DGRAM | SOCK_CLOEXEC, 0));
i = TEMP_FAILURE_RETRY(socket(PF_UNIX, SOCK_DGRAM | SOCK_CLOEXEC | SOCK_NONBLOCK, 0));
if (i < 0) {
ret = -errno;
} else if (TEMP_FAILURE_RETRY(fcntl(i, F_SETFL, O_NONBLOCK)) < 0) {
ret = -errno;
close(i);
} else {
struct sockaddr_un un;
memset(&un, 0, sizeof(struct sockaddr_un));