commit b5198121a6a26dab34e9a72842207d50d5f9a5a9
author Mark Salyzyn <salyzyn@google.com> Fri Dec 18 21:05:57 2015 +0000
committer android-build-merger <android-build-merger@google.com> Fri Dec 18 21:05:57 2015 +0000
tree 517df3a6ba74236adb9569516d9c67e1e01fa2f8
parent 1c1cabb47bfdafb753b8318369640449abf6a38f
parent e25bd764d4ca02a3b52c139d6e340d3758dcdbe6

Merge "liblog: Remove paranoia regarding logd" am: 1d51753461
am: e1341c6910

* commit 'e1341c69104bb9e9bc0ad01ce5481a7bc27c159e':
  liblog: Remove paranoia regarding logd

liblog/log_read.c

diff --git a/liblog/log_read.c b/liblog/log_read.c
index 8aa887b..eb44b29 100644
--- a/liblog/log_read.c
+++ b/liblog/log_read.c
@@ -880,18 +880,10 @@
             sigaction(SIGALRM, &old_sigaction, NULL);
         }
 
-        if (ret <= 0) {
-            if ((ret == -1) && e) {
-                return -e;
-            }
-            return ret;
+        if ((ret == -1) && e) {
+            return -e;
         }
-
-        logger_for_each(logger, logger_list) {
-            if (log_msg->entry.lid == logger->id) {
-                return ret;
-            }
-        }
+        return ret;
     }
     /* NOTREACH */
     return ret;