diff options
| author | Bernard Xiong <root@VM-152-115-ubuntu.(none)> | 2014-07-31 09:30:18 +0800 |
|---|---|---|
| committer | Bernard Xiong <root@VM-152-115-ubuntu.(none)> | 2014-07-31 09:30:18 +0800 |
| commit | 59c128c0733c4b3ffa61558bb2ce8bf981c78adb (patch) | |
| tree | 8380bbb92262d915f80f1583ca1f19d45a92c0a4 | |
| parent | 94883a92fbc43b41e4888beb27fc2c3e2a95d4f1 (diff) | |
[libc] fix compiling warning
| -rw-r--r-- | components/dfs/src/dfs_posix.c | 11 | ||||
| -rw-r--r-- | components/libc/newlib/syscalls.c | 8 |
2 files changed, 16 insertions, 3 deletions
diff --git a/components/dfs/src/dfs_posix.c b/components/dfs/src/dfs_posix.c index 96139837e9..a7d6159a1c 100644 --- a/components/dfs/src/dfs_posix.c +++ b/components/dfs/src/dfs_posix.c @@ -537,12 +537,17 @@ struct dirent *readdir(DIR *d) if (fd == RT_NULL) { rt_set_errno(-DFS_STATUS_EBADF); - return RT_NULL; } - if (!d->num || - (d->cur += ((struct dirent *)(d->buf + d->cur))->d_reclen) >= d->num) + if (d->num) + { + struct dirent* dirent_ptr; + dirent_ptr = (struct dirent*)&d->buf[d->cur]; + d->cur += dirent_ptr->d_reclen; + } + + if (!d->num || d->cur >= d->num) { /* get a new entry */ result = dfs_file_getdents(fd, diff --git a/components/libc/newlib/syscalls.c b/components/libc/newlib/syscalls.c index 5b829f4753..388d240c94 100644 --- a/components/libc/newlib/syscalls.c +++ b/components/libc/newlib/syscalls.c @@ -3,6 +3,14 @@ #include <sys/time.h> #include <rtthread.h> +#ifdef RT_USING_DFS +#include <dfs_posix.h> +#endif + +#ifdef RT_USING_PTHREADS +#include <pthread.h> +#endif + /* Reentrant versions of system calls. */ int |