Skip to content
This repository has been archived by the owner on Nov 8, 2023. It is now read-only.

Commit

Permalink
Change remaining Android logging macros to use C99 varidaic syntax
Browse files Browse the repository at this point in the history
Most of the system/core/include/log/log.h file uses the C99 syntax of
variadic macros (that is, '...' in parameter list and __VA_ARGS__
in arguments). Except for andoid_printLog and android_printAssert
which still uses GCC custom extension syntax.

Switched the remaining macros to use C99 syntax. GCC extension syntax
makes my editor's code parser puke.

BUG: None
Change-Id: Ia6ebc0f2044b64182c425b179da0229c7046be4a
  • Loading branch information
Alex Vakulenko committed Apr 27, 2016
1 parent 6d28ae7 commit 3b0d65a
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions include/log/log.h
Expand Up @@ -614,11 +614,11 @@ int android_log_destroy(android_log_context *ctx);
* The stuff in the rest of this file should not be used directly.
*/

#define android_printLog(prio, tag, fmt...) \
__android_log_print(prio, tag, fmt)
#define android_printLog(prio, tag, ...) \
__android_log_print(prio, tag, __VA_ARGS__)

#define android_vprintLog(prio, cond, tag, fmt...) \
__android_log_vprint(prio, tag, fmt)
#define android_vprintLog(prio, cond, tag, ...) \
__android_log_vprint(prio, tag, __VA_ARGS__)

/* XXX Macros to work around syntax errors in places where format string
* arg is not passed to ALOG_ASSERT, LOG_ALWAYS_FATAL or LOG_ALWAYS_FATAL_IF
Expand All @@ -635,9 +635,9 @@ int android_log_destroy(android_log_context *ctx);
*/
#define __android_rest(first, ...) , ## __VA_ARGS__

#define android_printAssert(cond, tag, fmt...) \
#define android_printAssert(cond, tag, ...) \
__android_log_assert(cond, tag, \
__android_second(0, ## fmt, NULL) __android_rest(fmt))
__android_second(0, ## __VA_ARGS__, NULL) __android_rest(__VA_ARGS__))

#define android_writeLog(prio, tag, text) \
__android_log_write(prio, tag, text)
Expand Down

0 comments on commit 3b0d65a

Please sign in to comment.