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

logwriter: fix shadowing compiler warnings

Browse Source
This commit is contained in:
Beat Küng
2016-10-17 15:51:32 +02:00
committed by Lorenz Meier
parent b2d45732c2
commit 9272aa592a
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/logger/log_writer.cpp
+10 -10
View File
@@ -38,10 +38,10 @@ namespace px4
namespace logger
{
LogWriter::LogWriter(Backend backend, size_t file_buffer_size, unsigned int queue_size)
: _backend(backend)
LogWriter::LogWriter(Backend configured_backend, size_t file_buffer_size, unsigned int queue_size)
: _backend(configured_backend)
{
if (backend & BackendFile) {
if (configured_backend & BackendFile) {
_log_writer_file_for_write = _log_writer_file = new LogWriterFile(file_buffer_size);
if (!_log_writer_file) {
@@ -49,7 +49,7 @@ LogWriter::LogWriter(Backend backend, size_t file_buffer_size, unsigned int queu
}
}
if (backend & BackendMavlink) {
if (configured_backend & BackendMavlink) {
_log_writer_mavlink_for_write = _log_writer_mavlink = new LogWriterMavlink(queue_size);
if (!_log_writer_mavlink) {
@@ -110,13 +110,13 @@ bool LogWriter::is_started() const
return ret;
}
bool LogWriter::is_started(Backend backend) const
bool LogWriter::is_started(Backend query_backend) const
{
if (backend == BackendFile && _log_writer_file) {
if (query_backend == BackendFile && _log_writer_file) {
return _log_writer_file->is_started();
}
if (backend == BackendMavlink && _log_writer_mavlink) {
if (query_backend == BackendMavlink && _log_writer_mavlink) {
return _log_writer_mavlink->is_started();
}
@@ -178,16 +178,16 @@ int LogWriter::write_message(void *ptr, size_t size, uint64_t dropout_start)
return ret_mavlink;
}
void LogWriter::select_write_backend(Backend backend)
void LogWriter::select_write_backend(Backend sel_backend)
{
if (backend & BackendFile) {
if (sel_backend & BackendFile) {
_log_writer_file_for_write = _log_writer_file;
} else {
_log_writer_file_for_write = nullptr;
}
if (backend & BackendMavlink) {
if (sel_backend & BackendMavlink) {
_log_writer_mavlink_for_write = _log_writer_mavlink;
} else {