diff options
| author | Meco Man <[email protected]> | 2021-11-16 03:41:26 -0500 |
|---|---|---|
| committer | Meco Man <[email protected]> | 2021-11-16 03:41:26 -0500 |
| commit | 5e19b71eca9a9333c3de5434b832cde85b1d0f1a (patch) | |
| tree | a615aa30a11ae77ef6f296a71ff1f1a0bbc6cf0a | |
| parent | b98539e3f8e437b22014043d9a2adc0ced949c9b (diff) | |
将返回值类型由signed int改为int,符合ISO C标准,防止编译器报错
| -rw-r--r-- | include/rtthread.h | 10 | ||||
| -rw-r--r-- | src/kservice.c | 12 |
2 files changed, 12 insertions, 10 deletions
diff --git a/include/rtthread.h b/include/rtthread.h index 83be7d1ebc..8089ca07de 100644 --- a/include/rtthread.h +++ b/include/rtthread.h @@ -537,14 +537,14 @@ void rt_components_board_init(void); #define rt_kprintf(...) #define rt_kputs(str) #else -void rt_kprintf(const char *fmt, ...); +int rt_kprintf(const char *fmt, ...); void rt_kputs(const char *str); #endif -rt_int32_t 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); -rt_int32_t rt_sprintf(char *buf, const char *format, ...); -rt_int32_t rt_snprintf(char *buf, rt_size_t size, const char *format, ...); +int rt_vsprintf(char *dest, const char *format, va_list arg_ptr); +int rt_vsnprintf(char *buf, rt_size_t size, const char *fmt, va_list args); +int rt_sprintf(char *buf, const char *format, ...); +int rt_snprintf(char *buf, rt_size_t size, const char *format, ...); #if defined(RT_USING_DEVICE) && defined(RT_USING_CONSOLE) rt_device_t rt_console_set_device(const char *name); diff --git a/src/kservice.c b/src/kservice.c index 525aacd7fd..6493c58b6a 100644 --- a/src/kservice.c +++ b/src/kservice.c @@ -844,7 +844,7 @@ static char *print_number(char *buf, * * @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, const char *fmt, va_list args) @@ -1121,7 +1121,7 @@ RTM_EXPORT(rt_vsnprintf); * * @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; va_list args; @@ -1145,7 +1145,7 @@ RTM_EXPORT(rt_snprintf); * * @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); } @@ -1160,7 +1160,7 @@ RTM_EXPORT(rt_vsprintf); * * @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; va_list arg_ptr; @@ -1261,7 +1261,7 @@ void rt_kputs(const char *str) * * @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; rt_size_t length; @@ -1289,6 +1289,8 @@ RT_WEAK void rt_kprintf(const char *fmt, ...) rt_hw_console_output(rt_log_buf); #endif /* RT_USING_DEVICE */ va_end(args); + + return length; /* the total number of printed characters */ } RTM_EXPORT(rt_kprintf); #endif /* RT_USING_CONSOLE */ |
