ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
am: bc7f7e7311

Change-Id: Icf03649f7f7862f5727b347020e1410af7e2d74e
This commit is contained in:
Chih-Hung Hsieh 2018-07-25 16:52:02 -07:00 • committed by android-build-merger
commit 044942e5b8
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
liblog/include/log/log_main.h
View file

@ -47,7 +47,8 @@ __BEGIN_DECLS
* 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

2
lmkd/lmkd.c
View file

@ -341,7 +341,7 @@ static int reread_file(struct reread_data *data, char *buf, size_t buf_size) {
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;