fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-11-07 03:41:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

POSIX: fixed return values to be posix compliant

Browse Source 
px4_read, px4_write, and px4_opctl were not returning the correct
value on error. They were returning -errno vs -1.

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
This commit is contained in:
Mark Charlebois
2015-05-07 09:38:03 -07:00
parent 6db77dc8bb
commit 5e2af2b227
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/drivers/device/vdev_posix.cpp
+7 -6
View File
@@ -144,6 +144,7 @@ int px4_close(int fd)
} }
if (ret < 0) { if (ret < 0) {
px4_errno = -ret; px4_errno = -ret;
ret = PX4_ERROR;
} }
return ret; return ret;
} }
@@ -161,13 +162,14 @@ ssize_t px4_read(int fd, void *buffer, size_t buflen)
} }
if (ret < 0) { if (ret < 0) {
px4_errno = -ret; px4_errno = -ret;
ret = PX4_ERROR;
} }
return ret; return ret;
} }
ssize_t px4_write(int fd, const void *buffer, size_t buflen) ssize_t px4_write(int fd, const void *buffer, size_t buflen)
{ {
int ret = PX4_ERROR; int ret;
if (valid_fd(fd)) { if (valid_fd(fd)) {
VDev *dev = (VDev *)(filemap[fd]->vdev); VDev *dev = (VDev *)(filemap[fd]->vdev);
PX4_DEBUG("px4_write fd = %d\n", fd); PX4_DEBUG("px4_write fd = %d\n", fd);
@@ -178,13 +180,14 @@ ssize_t px4_write(int fd, const void *buffer, size_t buflen)
} }
if (ret < 0) { if (ret < 0) {
px4_errno = -ret; px4_errno = -ret;
ret = PX4_ERROR;
} }
return ret; return ret;
} }
int px4_ioctl(int fd, int cmd, unsigned long arg) int px4_ioctl(int fd, int cmd, unsigned long arg)
{ {
int ret = PX4_ERROR; int ret = 0;
if (valid_fd(fd)) { if (valid_fd(fd)) {
VDev *dev = (VDev *)(filemap[fd]->vdev); VDev *dev = (VDev *)(filemap[fd]->vdev);
PX4_DEBUG("px4_ioctl fd = %d\n", fd); PX4_DEBUG("px4_ioctl fd = %d\n", fd);
@@ -196,10 +199,8 @@ int px4_ioctl(int fd, int cmd, unsigned long arg)
if (ret < 0) { if (ret < 0) {
px4_errno = -ret; px4_errno = -ret;
} }
else {
px4_errno = -EINVAL; return (ret == 0) ? PX4_OK : PX4_ERROR;
}
return ret;
} }
int px4_poll(px4_pollfd_struct_t *fds, nfds_t nfds, int timeout) int px4_poll(px4_pollfd_struct_t *fds, nfds_t nfds, int timeout)