diff options
| author | Bernard Xiong <[email protected]> | 2019-12-19 11:04:40 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2019-12-19 11:04:40 +0800 |
| commit | 01fa184f9a019af654a6c5f24268362aad06eed3 (patch) | |
| tree | d676f4b5dda21c6e71ad92304174ad04d7518b9e /components | |
| parent | c05d9dfee630cb6f2bdbb296de6a34e21e4beb36 (diff) | |
| parent | 2c1f7b73a73f6e5aae7c9bbb1c38a609e39a1a08 (diff) | |
Merge pull request #3275 from BernardXiong/delayUtil
Delay until
Diffstat (limited to 'components')
| -rw-r--r-- | components/dfs/src/dfs_file.c | 8 | ||||
| -rw-r--r-- | components/drivers/src/pipe.c | 12 |
2 files changed, 13 insertions, 7 deletions
diff --git a/components/dfs/src/dfs_file.c b/components/dfs/src/dfs_file.c index 1063a278ab..91d39597f0 100644 --- a/components/dfs/src/dfs_file.c +++ b/components/dfs/src/dfs_file.c @@ -369,8 +369,7 @@ int dfs_file_stat(const char *path, struct stat *buf) if ((fs = dfs_filesystem_lookup(fullpath)) == NULL) { - LOG_E( - "can't find mounted filesystem on this path:%s", fullpath); + LOG_E("can't find mounted filesystem on this path:%s", fullpath); rt_free(fullpath); return -ENOENT; @@ -399,8 +398,7 @@ int dfs_file_stat(const char *path, struct stat *buf) if (fs->ops->stat == NULL) { rt_free(fullpath); - LOG_E( - "the filesystem didn't implement this function"); + LOG_E("the filesystem didn't implement this function"); return -ENOSYS; } @@ -565,7 +563,7 @@ void ls(const char *pathname) } else { - rt_kprintf("%-25lu\n", stat.st_size); + rt_kprintf("%-25lu\n", (unsigned long)stat.st_size); } } else diff --git a/components/drivers/src/pipe.c b/components/drivers/src/pipe.c index b682c351ad..ae87b6f5f2 100644 --- a/components/drivers/src/pipe.c +++ b/components/drivers/src/pipe.c @@ -19,6 +19,7 @@ static int pipe_fops_open(struct dfs_fd *fd) { + int rc = 0; rt_device_t device; rt_pipe_t *pipe; @@ -31,6 +32,11 @@ static int pipe_fops_open(struct dfs_fd *fd) if (device->ref_count == 0) { pipe->fifo = rt_ringbuffer_create(pipe->bufsz); + if (pipe->fifo == RT_NULL) + { + rc = -RT_ENOMEM; + goto __exit; + } } switch (fd->flags & O_ACCMODE) @@ -48,9 +54,10 @@ static int pipe_fops_open(struct dfs_fd *fd) } device->ref_count ++; +__exit: rt_mutex_release(&(pipe->lock)); - return 0; + return rc; } static int pipe_fops_close(struct dfs_fd *fd) @@ -90,7 +97,8 @@ static int pipe_fops_close(struct dfs_fd *fd) if (device->ref_count == 1) { - rt_ringbuffer_destroy(pipe->fifo); + if (pipe->fifo != RT_NULL) + rt_ringbuffer_destroy(pipe->fifo); pipe->fifo = RT_NULL; } device->ref_count --; |