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

fix logger: sscanf was used wrong for custom topics file

Browse Source 
using scanf with %s reads until the first whitespace, which included the
comma (as per C standard and tested on linux). Behavior on NuttX differs.

This makes it work on both Linux and Nuttx.
This commit is contained in:
Beat Küng
2017-01-06 13:32:10 +01:00
parent b8afc97959
commit 30f80515ec
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/logger/logger.cpp
+14 -5
View File
@@ -581,7 +581,6 @@ int Logger::add_topics_from_file(const char *fname)
}
/* call add_topic for each topic line in the file */
// format is TOPIC_NAME, [interval]
for (;;) {
/* get a line, bail on error/EOF */
@@ -596,14 +595,24 @@ int Logger::add_topics_from_file(const char *fname)
continue;
}
// default interval to zero
// read line with format: <topic_name>[, <interval>]
interval = 0;
int nfields = sscanf(line, "%s, %u", topic_name, &interval);
int nfields = sscanf(line, "%s %u", topic_name, &interval);
if (nfields > 0) {
int name_len = strlen(topic_name);
if (name_len > 0 && topic_name[name_len - 1] == ',') {
topic_name[name_len - 1] = '\0';
}
/* add topic with specified interval */
add_topic(topic_name, interval);
ntopics++;
if (add_topic(topic_name, interval) >= 0) {
ntopics++;
} else {
PX4_ERR("Failed to add topic %s", topic_name);
}
}
}