Mirrors_Framework/ardupilot
1
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot.git synced 2026-02-08 07:42:18 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

AP_Scripting: logger: use snprintf for more efficient prepend

Browse Source 
Contrary to the comment there is no scope issue.
This commit is contained in:
Thomas Watson
2025-12-08 20:41:01 -06:00
committed by Thomas Watson
parent 005a7afd30
commit be6ffb5f61
1 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
libraries/AP_Scripting/lua_bindings.cpp
View File

@@ -320,20 +320,14 @@ int AP_Logger_Write(lua_State *L) {
// prepend timestamp to format and labels
char label_cat[LS_LABELS_SIZE];
strcpy(label_cat,"TimeUS,");
strcat(label_cat,labels);
char fmt_cat[LS_FORMAT_SIZE];
strcpy(fmt_cat,"Q");
strcat(fmt_cat,fmt);
// Need to declare these here so they don't go out of scope
char units_cat[LS_FORMAT_SIZE];
char multipliers_cat[LS_FORMAT_SIZE];
snprintf(label_cat, sizeof(label_cat), "TimeUS,%s", labels);
snprintf(fmt_cat, sizeof(fmt_cat), "Q%s", fmt);
uint8_t field_start = 4;
struct AP_Logger::log_write_fmt *f;
if (!have_units) {
// ask for a mesage type
// ask for a mesage type (will duplicate incoming strings if necessary)
f = AP_logger->msg_fmt_for_name(name, label_cat, nullptr, nullptr, fmt_cat, true, true);
} else {
// read in units and multiplers strings
@@ -349,13 +343,12 @@ int AP_Logger_Write(lua_State *L) {
}
// prepend timestamp to units and multiplyers
strcpy(units_cat,"s");
strcat(units_cat,units);
char units_cat[LS_FORMAT_SIZE];
char multipliers_cat[LS_FORMAT_SIZE];
snprintf(units_cat, sizeof(units_cat), "s%s", units);
snprintf(multipliers_cat, sizeof(multipliers_cat), "F%s", multipliers);
strcpy(multipliers_cat,"F");
strcat(multipliers_cat,multipliers);
// ask for a mesage type
// ask for a mesage type (will duplicate incoming strings if necessary)
f = AP_logger->msg_fmt_for_name(name, label_cat, units_cat, multipliers_cat, fmt_cat, true, true);
}