Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e352a75b authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Declare __fake_use_va_args as a variadic function."

parents 3edffdb7 62b0ef55

liblog/include/log/log_main.h

+2 −1
Original line number Diff line number Diff line
@@ -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

lmkd/lmkd.c

+1 −1
Original line number Diff line number Diff line
@@ -332,7 +332,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;