Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-02-07 00:13:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

AP_CANManager: remove redundant calls to snprintf

Browse Source 
these only differ by the constant substring, so pull that out as a variable
This commit is contained in:
Peter Barker 2024-03-16 16:52:06 +11:00 committed by Peter Barker
parent e983738c38
commit 5cd18dbc45
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libraries/AP_CANManager/AP_CANManager.cpp
View File

@ -377,27 +377,30 @@ void AP_CANManager::log_text(AP_CANManager::LogLevel loglevel, const char *tag,
_log_pos = 0; _log_pos = 0;
} }
//Tag Log Message //Tag Log Message
const char *log_level_tag = "";
switch (loglevel) { switch (loglevel) {
case AP_CANManager::LOG_DEBUG : case AP_CANManager::LOG_DEBUG :
_log_pos += hal.util->snprintf(&_log_buf[_log_pos], LOG_BUFFER_SIZE - _log_pos, "\n%s DEBUG :", tag); log_level_tag = "DEBUG";
break; break;
case AP_CANManager::LOG_INFO : case AP_CANManager::LOG_INFO :
_log_pos += hal.util->snprintf(&_log_buf[_log_pos], LOG_BUFFER_SIZE - _log_pos, "\n%s INFO :", tag); log_level_tag = "INFO";
break; break;
case AP_CANManager::LOG_WARNING : case AP_CANManager::LOG_WARNING :
_log_pos += hal.util->snprintf(&_log_buf[_log_pos], LOG_BUFFER_SIZE - _log_pos, "\n%s WARN :", tag); log_level_tag = "WARN";
break; break;
case AP_CANManager::LOG_ERROR : case AP_CANManager::LOG_ERROR :
_log_pos += hal.util->snprintf(&_log_buf[_log_pos], LOG_BUFFER_SIZE - _log_pos, "\n%s ERROR :", tag); log_level_tag = "ERROR";
break; break;
default : case AP_CANManager::LOG_NONE:
return; return;
} }
_log_pos += hal.util->snprintf(&_log_buf[_log_pos], LOG_BUFFER_SIZE - _log_pos, "\n%s %s :", log_level_tag, tag);
va_list arg_list; va_list arg_list;
va_start(arg_list, fmt); va_start(arg_list, fmt);
_log_pos += hal.util->vsnprintf(&_log_buf[_log_pos], LOG_BUFFER_SIZE - _log_pos, fmt, arg_list); _log_pos += hal.util->vsnprintf(&_log_buf[_log_pos], LOG_BUFFER_SIZE - _log_pos, fmt, arg_list);