Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-05-27 18:27:05 +08:00
Code Issues Actions 30 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 namespace logger
{ {
LogWriter::LogWriter(Backend backend, size_t file_buffer_size, unsigned int queue_size) LogWriter::LogWriter(Backend configured_backend, size_t file_buffer_size, unsigned int queue_size)
: _backend(backend) : _backend(configured_backend)
{ {
if (backend & BackendFile) { if (configured_backend & BackendFile) {
_log_writer_file_for_write = _log_writer_file = new LogWriterFile(file_buffer_size); _log_writer_file_for_write = _log_writer_file = new LogWriterFile(file_buffer_size);
if (!_log_writer_file) { 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); _log_writer_mavlink_for_write = _log_writer_mavlink = new LogWriterMavlink(queue_size);
if (!_log_writer_mavlink) { if (!_log_writer_mavlink) {
@@ -110,13 +110,13 @@ bool LogWriter::is_started() const
return ret; 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(); 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(); 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; 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; _log_writer_file_for_write = _log_writer_file;
} else { } else {
_log_writer_file_for_write = nullptr; _log_writer_file_for_write = nullptr;
} }
if (backend & BackendMavlink) { if (sel_backend & BackendMavlink) {
_log_writer_mavlink_for_write = _log_writer_mavlink; _log_writer_mavlink_for_write = _log_writer_mavlink;
} else { } else {
src/modules/logger/log_writer.h
+4 -4
View File
@@ -55,7 +55,7 @@ public:
static constexpr Backend BackendMavlink = 1 << 1; static constexpr Backend BackendMavlink = 1 << 1;
static constexpr Backend BackendAll = BackendFile | BackendMavlink; static constexpr Backend BackendAll = BackendFile | BackendMavlink;
LogWriter(Backend backend, size_t file_buffer_size, unsigned int queue_size); LogWriter(Backend configured_backend, size_t file_buffer_size, unsigned int queue_size);
~LogWriter(); ~LogWriter();
bool init(); bool init();
@@ -81,7 +81,7 @@ public:
/** /**
* whether logging is currently active or not for a specific backend. * whether logging is currently active or not for a specific backend.
*/ */
bool is_started(Backend backend) const; bool is_started(Backend query_backend) const;
/** /**
* Write a single ulog message (including header). The caller must call lock() before calling this. * Write a single ulog message (including header). The caller must call lock() before calling this.
@@ -93,10 +93,10 @@ public:
/** /**
* Select a backend, so that future calls to write_message() only write to the selected * Select a backend, so that future calls to write_message() only write to the selected
* backend, until unselect_write_backend() is called. * sel_backend, until unselect_write_backend() is called.
* @param backend * @param backend
*/ */
void select_write_backend(Backend backend); void select_write_backend(Backend sel_backend);
void unselect_write_backend() { select_write_backend(BackendAll); } void unselect_write_backend() { select_write_backend(BackendAll); }
/* file logging methods */ /* file logging methods */