ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
am: 33f8c194f9

Change-Id: I742833b2933d1ab17543839f9749a7c4d7f13944
This commit is contained in:
Elliott Hughes 2016-08-23 01:23:29 +00:00 • committed by android-build-merger
commit 694b4880d8
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
liblog/logd_writer.c
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));