From 5e19b71eca9a9333c3de5434b832cde85b1d0f1a Mon Sep 17 00:00:00 2001 From: Meco Man <920369182@qq.com> Date: Tue, 16 Nov 2021 03:41:26 -0500 Subject: 将返回值类型由signed int改为int，符合ISO C标准，防止编译器报错 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- include/rtthread.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'include') 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); -- cgit v1.3.1 From e82fe76a0fccd87f9dd801ee5a5f3a359b357aaf Mon Sep 17 00:00:00 2001 From: Meco Man <920369182@qq.com> Date: Tue, 16 Nov 2021 12:06:55 -0500 Subject: fix rt_size_t as rt_uint32_t --- include/rtdef.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/include/rtdef.h b/include/rtdef.h index a324eea122..eb9381e71f 100644 --- a/include/rtdef.h +++ b/include/rtdef.h @@ -78,8 +78,8 @@ typedef unsigned long rt_uint64_t; /**< 64bit unsigned inte #else typedef signed long long rt_int64_t; /**< 64bit integer type */ typedef unsigned long long rt_uint64_t; /**< 64bit unsigned integer type */ -#endif -#endif +#endif /* ARCH_CPU_64BIT */ +#endif /* RT_USING_ARCH_DATA_TYPE */ typedef int rt_bool_t; /**< boolean type */ typedef long rt_base_t; /**< Nbit CPU related date type */ @@ -89,7 +89,7 @@ typedef rt_base_t rt_err_t; /**< Type for error numb typedef rt_uint32_t rt_time_t; /**< Type for time stamp */ typedef rt_uint32_t rt_tick_t; /**< Type for tick count */ typedef rt_base_t rt_flag_t; /**< Type for flags */ -typedef rt_ubase_t rt_size_t; /**< Type for size number */ +typedef rt_uint32_t rt_size_t; /**< Type for size number */ typedef rt_ubase_t rt_dev_t; /**< Type for device */ typedef rt_base_t rt_off_t; /**< Type for offset */ -- cgit v1.3.1 From cefc77ad11039eb0f93162fde3b8584c880dcf12 Mon Sep 17 00:00:00 2001 From: Meco Man <920369182@qq.com> Date: Mon, 22 Nov 2021 15:02:47 -0500 Subject: modify rt_size_t's type --- include/rtdef.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/rtdef.h b/include/rtdef.h index eb9381e71f..240161ac8c 100644 --- a/include/rtdef.h +++ b/include/rtdef.h @@ -75,9 +75,11 @@ typedef unsigned int rt_uint32_t; /**< 32bit unsigned inte #ifdef ARCH_CPU_64BIT typedef signed long rt_int64_t; /**< 64bit integer type */ typedef unsigned long rt_uint64_t; /**< 64bit unsigned integer type */ +typedef unsigned long rt_size_t; /**< Type for size number */ #else typedef signed long long rt_int64_t; /**< 64bit integer type */ typedef unsigned long long rt_uint64_t; /**< 64bit unsigned integer type */ +typedef unsigned int rt_size_t; /**< Type for size number */ #endif /* ARCH_CPU_64BIT */ #endif /* RT_USING_ARCH_DATA_TYPE */ @@ -89,7 +91,6 @@ typedef rt_base_t rt_err_t; /**< Type for error numb typedef rt_uint32_t rt_time_t; /**< Type for time stamp */ typedef rt_uint32_t rt_tick_t; /**< Type for tick count */ typedef rt_base_t rt_flag_t; /**< Type for flags */ -typedef rt_uint32_t rt_size_t; /**< Type for size number */ typedef rt_ubase_t rt_dev_t; /**< Type for device */ typedef rt_base_t rt_off_t; /**< Type for offset */ -- cgit v1.3.1