From 7383269905417f9e4f8f5304e164e0ae31d7169a Mon Sep 17 00:00:00 2001 From: Bernard Xiong Date: Tue, 12 Feb 2019 14:33:45 +0800 Subject: [PATCH] [Kernel] Code cleanup for compiling warning. --- components/dfs/src/dfs.c | 10 +++++----- components/drivers/serial/serial.c | 2 +- src/kservice.c | 2 +- src/mem.c | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/components/dfs/src/dfs.c b/components/dfs/src/dfs.c index 066c800568..6d52129b06 100644 --- a/components/dfs/src/dfs.c +++ b/components/dfs/src/dfs.c @@ -123,7 +123,7 @@ static int fd_alloc(struct dfs_fdtable *fdt, int startfd) int idx; /* find an empty fd entry */ - for (idx = startfd; idx < fdt->maxfd; idx++) + for (idx = startfd; idx < (int)fdt->maxfd; idx++) { if (fdt->fds[idx] == RT_NULL) break; @@ -155,7 +155,7 @@ static int fd_alloc(struct dfs_fdtable *fdt, int startfd) } /* allocate 'struct dfs_fd' */ - if (idx < fdt->maxfd &&fdt->fds[idx] == RT_NULL) + if (idx < (int)fdt->maxfd && fdt->fds[idx] == RT_NULL) { fdt->fds[idx] = rt_calloc(1, sizeof(struct dfs_fd)); if (fdt->fds[idx] == RT_NULL) @@ -223,7 +223,7 @@ struct dfs_fd *fd_get(int fd) fdt = dfs_fdtable_get(); fd = fd - DFS_FD_OFFSET; - if (fd < 0 || fd >= fdt->maxfd) + if (fd < 0 || fd >= (int)fdt->maxfd) return NULL; dfs_lock(); @@ -263,7 +263,7 @@ void fd_put(struct dfs_fd *fd) struct dfs_fdtable *fdt; fdt = dfs_fdtable_get(); - for (index = 0; index < fdt->maxfd; index ++) + for (index = 0; index < (int)fdt->maxfd; index ++) { if (fdt->fds[index] == fd) { @@ -531,7 +531,7 @@ int list_fd(void) rt_kprintf("fd type ref magic path\n"); rt_kprintf("-- ------ --- ----- ------\n"); - for (index = 0; index < fd_table->maxfd; index ++) + for (index = 0; index < (int)fd_table->maxfd; index ++) { struct dfs_fd *fd = fd_table->fds[index]; diff --git a/components/drivers/serial/serial.c b/components/drivers/serial/serial.c index 77f2a645a1..a03e4a719e 100644 --- a/components/drivers/serial/serial.c +++ b/components/drivers/serial/serial.c @@ -478,7 +478,7 @@ rt_inline int _serial_dma_rx(struct rt_serial_device *serial, rt_uint8_t *data, RT_ASSERT(rx_fifo != RT_NULL); - if (length < fifo_recved_len) + if (length < (int)fifo_recved_len) recv_len = length; else recv_len = fifo_recved_len; diff --git a/src/kservice.c b/src/kservice.c index dc7370d58b..b640107a33 100644 --- a/src/kservice.c +++ b/src/kservice.c @@ -476,7 +476,7 @@ rt_size_t rt_strnlen(const char *s, rt_ubase_t maxlen) { const char *sc; - for (sc = s; *sc != '\0' && sc - s < maxlen; ++sc) /* nothing */ + for (sc = s; *sc != '\0' && sc - s < (int)maxlen; ++sc) /* nothing */ ; return sc - s; diff --git a/src/mem.c b/src/mem.c index ca5329404e..8099b6bb7e 100644 --- a/src/mem.c +++ b/src/mem.c @@ -644,7 +644,7 @@ int memcheck(void) { position = (rt_ubase_t)mem - (rt_ubase_t)heap_ptr; if (position < 0) goto __exit; - if (position > mem_size_aligned) goto __exit; + if (position > (int)mem_size_aligned) goto __exit; if (mem->magic != HEAP_MAGIC) goto __exit; if (mem->used != 0 && mem->used != 1) goto __exit; } -- GitLab