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

Merge pull request #5174 from mysterywolf/timewarning 

[libc][time] Ensure the data types are consistent
This commit is contained in:
guo 2021-10-14 13:35:50 +08:00 committed by GitHub
parent a987cfe0e6 396b7da6fd
commit 1f28bd89f8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/drivers/src/ringbuffer.c
View File

@ -244,7 +244,7 @@ rt_size_t rt_ringbuffer_peak(struct rt_ringbuffer *rb, rt_uint8_t **ptr)
*ptr = &rb->buffer_ptr[rb->read_index]; *ptr = &rb->buffer_ptr[rb->read_index];
if(rb->buffer_size - rb->read_index > size) if((rt_size_t)(rb->buffer_size - rb->read_index) > size)
{ {
rb->read_index += size; rb->read_index += size;
return size; return size;

2
components/libc/compilers/common/time.c
View File

@ -240,7 +240,7 @@ RTM_EXPORT(mktime);
char* asctime_r(const struct tm *t, char *buf) char* asctime_r(const struct tm *t, char *buf)
{ {
/* Checking input validity */ /* Checking input validity */
if (rt_strlen(days) <= (t->tm_wday << 2) || rt_strlen(months) <= (t->tm_mon << 2)) if ((int)rt_strlen(days) <= (t->tm_wday << 2) || (int)rt_strlen(months) <= (t->tm_mon << 2))
{ {
LOG_W("asctime_r: the input parameters exceeded the limit, please check it."); LOG_W("asctime_r: the input parameters exceeded the limit, please check it.");
*(int*) buf = *(int*) days; *(int*) buf = *(int*) days;