Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 694b4880 authored by Elliott Hughes's avatar Elliott Hughes Committed by android-build-merger
Browse files

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

am: 33f8c194

Change-Id: I742833b2933d1ab17543839f9749a7c4d7f13944
parents a2408aaf 33f8c194

liblog/logd_writer.c

+1 −4
Original line number Diff line number Diff line
@@ -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));