dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

mavlink FTP: Fix build system error for unit test

This commit is contained in:
Lorenz Meier 2015-05-17 10:48:12 +02:00
parent 26954ece2c
commit 3032afb803
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/modules/mavlink/mavlink_ftp.cpp
View File

@ -310,8 +310,12 @@ MavlinkFTP::_workList(PayloadHeader* payload)
DIR *dp = opendir(dirPath); DIR *dp = opendir(dirPath);
if (dp == nullptr) { if (dp == nullptr) {
#ifdef MAVLINK_FTP_UNIT_TEST
warnx("File open failed");
#else
_mavlink->send_statustext_critical("FTP: can't open path (file system corrupted?)"); _mavlink->send_statustext_critical("FTP: can't open path (file system corrupted?)");
_mavlink->send_statustext_critical(dirPath); _mavlink->send_statustext_critical(dirPath);
#endif
// this is not an FTP error, abort directory read and continue // this is not an FTP error, abort directory read and continue
payload->data[offset++] = kDirentSkip; payload->data[offset++] = kDirentSkip;
@ -334,8 +338,12 @@ MavlinkFTP::_workList(PayloadHeader* payload)
for (;;) { for (;;) {
// read the directory entry // read the directory entry
if (readdir_r(dp, &entry, &result)) { if (readdir_r(dp, &entry, &result)) {
#ifdef MAVLINK_FTP_UNIT_TEST
warnx("readdir_r failed");
#else
_mavlink->send_statustext_critical("FTP: list readdir_r failure"); _mavlink->send_statustext_critical("FTP: list readdir_r failure");
_mavlink->send_statustext_critical(dirPath); _mavlink->send_statustext_critical(dirPath);
#endif
payload->data[offset++] = kDirentSkip; payload->data[offset++] = kDirentSkip;
*((char *)&payload->data[offset]) = '\0'; *((char *)&payload->data[offset]) = '\0';