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

MAVLink FTP: Use modern output printing to capture errors in system log

Browse Source
This commit is contained in:
Lorenz Meier
2017-07-29 16:12:41 +02:00
parent 68d70cc8c0
commit 37657cf99b
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/mavlink/mavlink_ftp.cpp
+8 -8
View File
@@ -479,7 +479,7 @@ MavlinkFTP::ErrorCode
MavlinkFTP::_workOpen(PayloadHeader *payload, int oflag) MavlinkFTP::_workOpen(PayloadHeader *payload, int oflag)
{ {
if (_session_info.fd >= 0) { if (_session_info.fd >= 0) {
warnx("FTP: Open failed - out of sessions\n"); PX4_ERR("FTP: Open failed - out of sessions\n");
return kErrNoSessionsAvailable; return kErrNoSessionsAvailable;
} }
@@ -537,12 +537,12 @@ MavlinkFTP::_workRead(PayloadHeader *payload)
// We have to test seek past EOF ourselves, lseek will allow seek past EOF // We have to test seek past EOF ourselves, lseek will allow seek past EOF
if (payload->offset >= _session_info.file_size) { if (payload->offset >= _session_info.file_size) {
warnx("request past EOF"); PX4_ERR("request past EOF");
return kErrEOF; return kErrEOF;
} }
if (lseek(_session_info.fd, payload->offset, SEEK_SET) < 0) { if (lseek(_session_info.fd, payload->offset, SEEK_SET) < 0) {
warnx("seek fail"); PX4_ERR("seek fail");
return kErrFailErrno; return kErrFailErrno;
} }
@@ -550,7 +550,7 @@ MavlinkFTP::_workRead(PayloadHeader *payload)
if (bytes_read < 0) { if (bytes_read < 0) {
// Negative return indicates error other than eof // Negative return indicates error other than eof
warnx("read fail %d", bytes_read); PX4_ERR("read fail %d", bytes_read);
return kErrFailErrno; return kErrFailErrno;
} }
@@ -590,7 +590,7 @@ MavlinkFTP::_workWrite(PayloadHeader *payload)
if (lseek(_session_info.fd, payload->offset, SEEK_SET) < 0) { if (lseek(_session_info.fd, payload->offset, SEEK_SET) < 0) {
// Unable to see to the specified location // Unable to see to the specified location
warnx("seek fail"); PX4_ERR("seek fail");
return kErrFailErrno; return kErrFailErrno;
} }
@@ -598,7 +598,7 @@ MavlinkFTP::_workWrite(PayloadHeader *payload)
if (bytes_written < 0) { if (bytes_written < 0) {
// Negative return indicates error other than eof // Negative return indicates error other than eof
warnx("write fail %d", bytes_written); PX4_ERR("write fail %d", bytes_written);
return kErrFailErrno; return kErrFailErrno;
} }
@@ -910,7 +910,7 @@ MavlinkFTP::_copy_file(const char *src_path, const char *dst_path, size_t length
break; break;
} else if (bytes_read < 0) { } else if (bytes_read < 0) {
warnx("cp: read"); PX4_ERR("cp: read");
op_errno = errno; op_errno = errno;
break; break;
} }
@@ -918,7 +918,7 @@ MavlinkFTP::_copy_file(const char *src_path, const char *dst_path, size_t length
bytes_written = ::write(dst_fd, _work_buffer2, bytes_read); bytes_written = ::write(dst_fd, _work_buffer2, bytes_read);
if (bytes_written != bytes_read) { if (bytes_written != bytes_read) {
warnx("cp: short write"); PX4_ERR("cp: short write");
op_errno = errno; op_errno = errno;
break; break;
} }