libs/rt-thread-official
libs
/
rt-thread-official
mirror of https://github.com/RT-Thread/rt-thread.git
4
0
Fork 0
Code Issues Releases Wiki Activity

将返回值类型由signed int改为int，符合ISO C标准，防止编译器报错

This commit is contained in:
Meco Man 2021-11-16 03:41:26 -05:00
parent b98539e3f8
commit 5e19b71eca
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/rtthread.h
View File

@ -537,14 +537,14 @@ void rt_components_board_init(void);
#define rt_kprintf(...) #define rt_kprintf(...)
#define rt_kputs(str) #define rt_kputs(str)
#else #else
void rt_kprintf(const char *fmt, ...); int rt_kprintf(const char *fmt, ...);
void rt_kputs(const char *str); void rt_kputs(const char *str);
#endif #endif
rt_int32_t rt_vsprintf(char *dest, const char *format, va_list arg_ptr); int rt_vsprintf(char *dest, const char *format, va_list arg_ptr);
rt_int32_t rt_vsnprintf(char *buf, rt_size_t size, const char *fmt, va_list args); int rt_vsnprintf(char *buf, rt_size_t size, const char *fmt, va_list args);
rt_int32_t rt_sprintf(char *buf, const char *format, ...); int rt_sprintf(char *buf, const char *format, ...);
rt_int32_t rt_snprintf(char *buf, rt_size_t size, const char *format, ...); int rt_snprintf(char *buf, rt_size_t size, const char *format, ...);
#if defined(RT_USING_DEVICE) && defined(RT_USING_CONSOLE) #if defined(RT_USING_DEVICE) && defined(RT_USING_CONSOLE)
rt_device_t rt_console_set_device(const char *name); rt_device_t rt_console_set_device(const char *name);

12
src/kservice.c
View File

@ -844,7 +844,7 @@ static char *print_number(char *buf,
* *
* @return The number of characters actually written to buffer. * @return The number of characters actually written to buffer.
*/ */
RT_WEAK rt_int32_t rt_vsnprintf(char *buf, RT_WEAK int rt_vsnprintf(char *buf,
rt_size_t size, rt_size_t size,
const char *fmt, const char *fmt,
va_list args) va_list args)
@ -1121,7 +1121,7 @@ RTM_EXPORT(rt_vsnprintf);
* *
* @return The number of characters actually written to buffer. * @return The number of characters actually written to buffer.
*/ */
rt_int32_t rt_snprintf(char *buf, rt_size_t size, const char *fmt, ...) int rt_snprintf(char *buf, rt_size_t size, const char *fmt, ...)
{ {
rt_int32_t n; rt_int32_t n;
va_list args; va_list args;
@ -1145,7 +1145,7 @@ RTM_EXPORT(rt_snprintf);
* *
* @return The number of characters actually written to buffer. * @return The number of characters actually written to buffer.
*/ */
rt_int32_t rt_vsprintf(char *buf, const char *format, va_list arg_ptr) int rt_vsprintf(char *buf, const char *format, va_list arg_ptr)
{ {
return rt_vsnprintf(buf, (rt_size_t) - 1, format, arg_ptr); return rt_vsnprintf(buf, (rt_size_t) - 1, format, arg_ptr);
} }
@ -1160,7 +1160,7 @@ RTM_EXPORT(rt_vsprintf);
* *
* @return The number of characters actually written to buffer. * @return The number of characters actually written to buffer.
*/ */
rt_int32_t rt_sprintf(char *buf, const char *format, ...) int rt_sprintf(char *buf, const char *format, ...)
{ {
rt_int32_t n; rt_int32_t n;
va_list arg_ptr; va_list arg_ptr;
@ -1261,7 +1261,7 @@ void rt_kputs(const char *str)
* *
* @param fmt is the format parameters. * @param fmt is the format parameters.
*/ */
RT_WEAK void rt_kprintf(const char *fmt, ...) RT_WEAK int rt_kprintf(const char *fmt, ...)
{ {
va_list args; va_list args;
rt_size_t length; rt_size_t length;
@ -1289,6 +1289,8 @@ RT_WEAK void rt_kprintf(const char *fmt, ...)
rt_hw_console_output(rt_log_buf); rt_hw_console_output(rt_log_buf);
#endif /* RT_USING_DEVICE */ #endif /* RT_USING_DEVICE */
va_end(args); va_end(args);
return length; /* the total number of printed characters */
} }
RTM_EXPORT(rt_kprintf); RTM_EXPORT(rt_kprintf);
#endif /* RT_USING_CONSOLE */ #endif /* RT_USING_CONSOLE */