commit 1f64ecd2ff7ffbf0c7c6aa2f8d88d1a9f0f4f7e9
author Elliott Hughes <enh@google.com> Mon Aug 22 14:17:58 2016 -0700
committer Elliott Hughes <enh@google.com> Mon Aug 22 16:19:58 2016 -0700
tree e6af299285a434edc74814f8904265c32b92ee1d
parent bce5c6bc99df053e2aed8f2fc506d3c49d27e5e9

liblog: use SOCK_NONBLOCK directly.

No need to have a race, even if it doesn't matter.

Change-Id: Ia79f2633643bc63618de0fd85953b3226415484f

liblog/logd_writer.c

diff --git a/liblog/logd_writer.c b/liblog/logd_writer.c
index 059f170..ed82902 100644
--- a/liblog/logd_writer.c
+++ b/liblog/logd_writer.c
@@ -67,12 +67,9 @@
     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));