dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

fix 'unterminated function-like macro invocation', fixes #2913

This commit is contained in:
Thomas Gubler 2015-09-27 11:37:30 +02:00 committed by Lorenz Meier
parent e2b801a323
commit 1ae8483e2c
1 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/platforms/px4_log.h
View File

@ -63,7 +63,7 @@ static inline void do_nothing(int level, ...)
#define PX4_ERR(...) ROS_WARN(__VA_ARGS__) #define PX4_ERR(...) ROS_WARN(__VA_ARGS__)
#define PX4_WARN(...) ROS_WARN(__VA_ARGS__) #define PX4_WARN(...) ROS_WARN(__VA_ARGS__)
#define PX4_INFO(...) ROS_WARN(__VA_ARGS__) #define PX4_INFO(...) ROS_WARN(__VA_ARGS__)
#define PX4_DEBUG(...) #define PX4_DEBUG(...)
#elif defined(__PX4_QURT) #elif defined(__PX4_QURT)
#include "qurt_log.h" #include "qurt_log.h"
@ -137,13 +137,13 @@ __END_DECLS
* *
* To write to a specific stream for each message type, open the streams and * To write to a specific stream for each message type, open the streams and
* set __px4__log_startline to something like: * set __px4__log_startline to something like:
* if (level <= __px4_log_level_current) printf(_px4_fd[level], * if (level <= __px4_log_level_current) printf(_px4_fd[level],
* *
* Additional behavior can be added using "{\" for __px4__log_startline and * Additional behavior can be added using "{\" for __px4__log_startline and
* "}" for __px4__log_endline and any other required setup or teardown steps * "}" for __px4__log_endline and any other required setup or teardown steps
****************************************************************************/ ****************************************************************************/
#define __px4__log_startcond(cond) if (cond) printf( #define __px4__log_printcond(cond, ...) if (cond) printf(__VA_ARGS__)
#define __px4__log_startline(level) if (level <= __px4_log_level_current) printf( #define __px4__log_printline(level, ...) if (level <= __px4_log_level_current) printf(__VA_ARGS__)
#define __px4__log_timestamp_fmt "%-10" PRIu64 " " #define __px4__log_timestamp_fmt "%-10" PRIu64 " "
#define __px4__log_timestamp_arg ,hrt_absolute_time() #define __px4__log_timestamp_arg ,hrt_absolute_time()
@ -172,12 +172,12 @@ __END_DECLS
* if the first arg/condition is true. * if the first arg/condition is true.
****************************************************************************/ ****************************************************************************/
#define __px4_log_named_cond(name, cond, FMT, ...) \ #define __px4_log_named_cond(name, cond, FMT, ...) \
__px4__log_startcond(cond)\ __px4__log_printcond(cond,\
"%s " \ "%s " \
FMT\ FMT\
__px4__log_end_fmt \ __px4__log_end_fmt \
,name, ##__VA_ARGS__\ ,name, ##__VA_ARGS__\
__px4__log_endline )
/**************************************************************************** /****************************************************************************
* __px4_log: * __px4_log:
@ -187,12 +187,12 @@ __END_DECLS
* printf("%-5s val is %d\n", __px4_log_level_str[3], val); * printf("%-5s val is %d\n", __px4_log_level_str[3], val);
****************************************************************************/ ****************************************************************************/
#define __px4_log(level, FMT, ...) \ #define __px4_log(level, FMT, ...) \
__px4__log_startline(level)\ __px4__log_printline(level,\
__px4__log_level_fmt \ __px4__log_level_fmt \
FMT\ FMT\
__px4__log_end_fmt \ __px4__log_end_fmt \
__px4__log_level_arg(level), ##__VA_ARGS__\ __px4__log_level_arg(level), ##__VA_ARGS__\
__px4__log_endline )
/**************************************************************************** /****************************************************************************
* __px4_log_timestamp: * __px4_log_timestamp:
@ -203,7 +203,7 @@ __END_DECLS
* hrt_absolute_time(), val); * hrt_absolute_time(), val);
****************************************************************************/ ****************************************************************************/
#define __px4_log_timestamp(level, FMT, ...) \ #define __px4_log_timestamp(level, FMT, ...) \
__px4__log_startline(level)\ __px4__log_printline(level,\
__px4__log_level_fmt\ __px4__log_level_fmt\
__px4__log_timestamp_fmt\ __px4__log_timestamp_fmt\
FMT\ FMT\
@ -211,7 +211,7 @@ __END_DECLS
__px4__log_level_arg(level)\ __px4__log_level_arg(level)\
__px4__log_timestamp_arg\ __px4__log_timestamp_arg\
, ##__VA_ARGS__\ , ##__VA_ARGS__\
__px4__log_endline )
/**************************************************************************** /****************************************************************************
* __px4_log_timestamp_thread: * __px4_log_timestamp_thread:
@ -222,7 +222,7 @@ __END_DECLS
* hrt_absolute_time(), pthread_self(), val); * hrt_absolute_time(), pthread_self(), val);
****************************************************************************/ ****************************************************************************/
#define __px4_log_timestamp_thread(level, FMT, ...) \ #define __px4_log_timestamp_thread(level, FMT, ...) \
__px4__log_startline(level)\ __px4__log_printline(level,\
__px4__log_level_fmt\ __px4__log_level_fmt\
__px4__log_timestamp_fmt\ __px4__log_timestamp_fmt\
__px4__log_thread_fmt\ __px4__log_thread_fmt\
@ -232,18 +232,18 @@ __END_DECLS
__px4__log_timestamp_arg\ __px4__log_timestamp_arg\
__px4__log_thread_arg\ __px4__log_thread_arg\
, ##__VA_ARGS__\ , ##__VA_ARGS__\
__px4__log_endline )
/**************************************************************************** /****************************************************************************
* __px4_log_file_and_line: * __px4_log_file_and_line:
* Convert a message in the form: * Convert a message in the form:
* PX4_WARN("val is %d", val); * PX4_WARN("val is %d", val);
* to * to
* printf("%-5s val is %d (file %s line %u)\n", * printf("%-5s val is %d (file %s line %u)\n",
* __px4_log_level_str[3], val, __FILE__, __LINE__); * __px4_log_level_str[3], val, __FILE__, __LINE__);
****************************************************************************/ ****************************************************************************/
#define __px4_log_file_and_line(level, FMT, ...) \ #define __px4_log_file_and_line(level, FMT, ...) \
__px4__log_startline(level)\ __px4__log_printline(level,\
__px4__log_level_fmt\ __px4__log_level_fmt\
__px4__log_timestamp_fmt\ __px4__log_timestamp_fmt\
FMT\ FMT\
@ -253,19 +253,19 @@ __END_DECLS
__px4__log_timestamp_arg\ __px4__log_timestamp_arg\
, ##__VA_ARGS__\ , ##__VA_ARGS__\
__px4__log_file_and_line_arg\ __px4__log_file_and_line_arg\
__px4__log_endline )
/**************************************************************************** /****************************************************************************
* __px4_log_timestamp_file_and_line: * __px4_log_timestamp_file_and_line:
* Convert a message in the form: * Convert a message in the form:
* PX4_WARN("val is %d", val); * PX4_WARN("val is %d", val);
* to * to
* printf("%-5s %-10lu val is %d (file %s line %u)\n", * printf("%-5s %-10lu val is %d (file %s line %u)\n",
* __px4_log_level_str[3], hrt_absolute_time(), * __px4_log_level_str[3], hrt_absolute_time(),
* val, __FILE__, __LINE__); * val, __FILE__, __LINE__);
****************************************************************************/ ****************************************************************************/
#define __px4_log_timestamp_file_and_line(level, FMT, ...) \ #define __px4_log_timestamp_file_and_line(level, FMT, ...) \
__px4__log_startline(level)\ __px4__log_printline(level,\
__px4__log_level_fmt\ __px4__log_level_fmt\
__px4__log_timestamp_fmt\ __px4__log_timestamp_fmt\
FMT\ FMT\
@ -275,19 +275,19 @@ __END_DECLS
__px4__log_timestamp_arg\ __px4__log_timestamp_arg\
, ##__VA_ARGS__\ , ##__VA_ARGS__\
__px4__log_file_and_line_arg\ __px4__log_file_and_line_arg\
__px4__log_endline )
/**************************************************************************** /****************************************************************************
* __px4_log_thread_file_and_line: * __px4_log_thread_file_and_line:
* Convert a message in the form: * Convert a message in the form:
* PX4_WARN("val is %d", val); * PX4_WARN("val is %d", val);
* to * to
* printf("%-5s %#X val is %d (file %s line %u)\n", * printf("%-5s %#X val is %d (file %s line %u)\n",
* __px4_log_level_str[3], pthread_self(), * __px4_log_level_str[3], pthread_self(),
* val, __FILE__, __LINE__); * val, __FILE__, __LINE__);
****************************************************************************/ ****************************************************************************/
#define __px4_log_thread_file_and_line(level, FMT, ...) \ #define __px4_log_thread_file_and_line(level, FMT, ...) \
__px4__log_startline(level)\ __px4__log_printline(level,\
__px4__log_level_fmt\ __px4__log_level_fmt\
__px4__log_thread_fmt\ __px4__log_thread_fmt\
FMT\ FMT\
@ -297,19 +297,19 @@ __END_DECLS
__px4__log_thread_arg\ __px4__log_thread_arg\
, ##__VA_ARGS__\ , ##__VA_ARGS__\
__px4__log_file_and_line_arg\ __px4__log_file_and_line_arg\
__px4__log_endline )
/**************************************************************************** /****************************************************************************
* __px4_log_timestamp_thread_file_and_line: * __px4_log_timestamp_thread_file_and_line:
* Convert a message in the form: * Convert a message in the form:
* PX4_WARN("val is %d", val); * PX4_WARN("val is %d", val);
* to * to
* printf("%-5s %-10lu %#X val is %d (file %s line %u)\n", * printf("%-5s %-10lu %#X val is %d (file %s line %u)\n",
* __px4_log_level_str[3], hrt_absolute_time(), * __px4_log_level_str[3], hrt_absolute_time(),
* pthread_self(), val, __FILE__, __LINE__); * pthread_self(), val, __FILE__, __LINE__);
****************************************************************************/ ****************************************************************************/
#define __px4_log_timestamp_thread_file_and_line(level, FMT, ...) \ #define __px4_log_timestamp_thread_file_and_line(level, FMT, ...) \
__px4__log_startline(level)\ __px4__log_printline(level,\
__px4__log_level_fmt\ __px4__log_level_fmt\
__px4__log_timestamp_fmt\ __px4__log_timestamp_fmt\
__px4__log_thread_fmt\ __px4__log_thread_fmt\
@ -321,7 +321,7 @@ __END_DECLS
__px4__log_thread_arg\ __px4__log_thread_arg\
, ##__VA_ARGS__\ , ##__VA_ARGS__\
__px4__log_file_and_line_arg\ __px4__log_file_and_line_arg\
__px4__log_endline )
/**************************************************************************** /****************************************************************************