commit a6f36b97b2e0014a6743cf7bf28a74fc97487e71
author Chih-Hung Hsieh <chh@google.com> Wed Jul 25 16:44:45 2018 -0700
committer android-build-merger <android-build-merger@google.com> Wed Jul 25 16:44:45 2018 -0700
tree 571b320b9029a91a11980ecbf1e27bd5911f0f8c
parent 915759e128c9816eed2264cc3484942249983290
parent 68f8201461c01fa2096898046ff188b0dfe8b858

Merge "Declare __fake_use_va_args as a variadic function."
am: e352a75b90

Change-Id: I4cfeb23cab215741944485baa47450115ed671e0

liblog/include/log/log_main.h

diff --git a/liblog/include/log/log_main.h b/liblog/include/log/log_main.h
index 9c68ff2..1314330 100644
--- a/liblog/include/log/log_main.h
+++ b/liblog/include/log/log_main.h
@@ -47,7 +47,8 @@
  * so don't link with __clang_analyzer__ defined.
  */
 #ifdef __clang_analyzer__
-extern void __FAKE_USE_VA_ARGS(...);
+extern void __fake_use_va_args(int, ...);
+#define __FAKE_USE_VA_ARGS(...) __fake_use_va_args(0, ##__VA_ARGS__)
 #else
 #define __FAKE_USE_VA_ARGS(...) ((void)(0))
 #endif

lmkd/lmkd.c

diff --git a/lmkd/lmkd.c b/lmkd/lmkd.c
index e984ac8..467eb2f 100644
--- a/lmkd/lmkd.c
+++ b/lmkd/lmkd.c
@@ -341,7 +341,7 @@
         data->fd = -1;
         return -1;
     }
-    ALOG_ASSERT((size_t)size < buf_size - 1, data->filename " too large");
+    ALOG_ASSERT((size_t)size < buf_size - 1, "%s too large", data->filename);
     buf[size] = 0;
 
     return 0;