diff options
author | Chih-Hung Hsieh | 2018-07-25 14:15:25 -0500 |
---|---|---|
committer | Chih-Hung Hsieh | 2018-07-25 16:36:35 -0500 |
commit | 62b0ef556d778a5734ce84d1da6e7ca8cf8f9362 (patch) | |
tree | a96112f8fee69a776bc9165ca1b3a4450aa00532 | |
parent | 56795ac483e09678b4c92b7cc213c1c68f8718f7 (diff) | |
download | platform-system-core-62b0ef556d778a5734ce84d1da6e7ca8cf8f9362.tar.gz platform-system-core-62b0ef556d778a5734ce84d1da6e7ca8cf8f9362.tar.xz platform-system-core-62b0ef556d778a5734ce84d1da6e7ca8cf8f9362.zip |
Declare __fake_use_va_args as a variadic function.
* New clang compiler requires variadic function to have
at least one named parameter type.
* Use ##__VA_ARGS__ to work with empty __VA_ARGS__.
* Fix one ALOG_ASSERT parameter bug in lmkd/lmkd.c.
Bug: 111614304
Test: make with WITH_TIDY=1
Change-Id: I90f35aa88527a6897954f69a35b256a157a725c5
-rw-r--r-- | liblog/include/log/log_main.h | 3 | ||||
-rw-r--r-- | lmkd/lmkd.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/liblog/include/log/log_main.h b/liblog/include/log/log_main.h index 9c68ff2b4..13143306a 100644 --- a/liblog/include/log/log_main.h +++ b/liblog/include/log/log_main.h | |||
@@ -47,7 +47,8 @@ __BEGIN_DECLS | |||
47 | * so don't link with __clang_analyzer__ defined. | 47 | * so don't link with __clang_analyzer__ defined. |
48 | */ | 48 | */ |
49 | #ifdef __clang_analyzer__ | 49 | #ifdef __clang_analyzer__ |
50 | extern void __FAKE_USE_VA_ARGS(...); | 50 | extern void __fake_use_va_args(int, ...); |
51 | #define __FAKE_USE_VA_ARGS(...) __fake_use_va_args(0, ##__VA_ARGS__) | ||
51 | #else | 52 | #else |
52 | #define __FAKE_USE_VA_ARGS(...) ((void)(0)) | 53 | #define __FAKE_USE_VA_ARGS(...) ((void)(0)) |
53 | #endif | 54 | #endif |
diff --git a/lmkd/lmkd.c b/lmkd/lmkd.c index 1cfef34ff..c2487d62d 100644 --- a/lmkd/lmkd.c +++ b/lmkd/lmkd.c | |||
@@ -332,7 +332,7 @@ static int reread_file(struct reread_data *data, char *buf, size_t buf_size) { | |||
332 | data->fd = -1; | 332 | data->fd = -1; |
333 | return -1; | 333 | return -1; |
334 | } | 334 | } |
335 | ALOG_ASSERT((size_t)size < buf_size - 1, data->filename " too large"); | 335 | ALOG_ASSERT((size_t)size < buf_size - 1, "%s too large", data->filename); |
336 | buf[size] = 0; | 336 | buf[size] = 0; |
337 | 337 | ||
338 | return 0; | 338 | return 0; |