logging: Minor consistency fixes.

[pulseview.git] / pv / logging.cpp

diff --git a/pv/logging.cpp b/pv/logging.cpp
index b0355168dbb640438db4f62e1b6661e9a2e3826d..1d4eb7c9b92ee29b6a806fa8c9464fa05765d81a 100644 (file)
--- a/pv/logging.cpp
+++ b/pv/logging.cpp
@@ -55,9 +55,9 @@ void Logging::init()
        buffer_.reserve(buffer_size_);
 
        qInstallMessageHandler(log_pv);
        buffer_.reserve(buffer_size_);
 
        qInstallMessageHandler(log_pv);

-       sr_log_callback_set(log_libsigrok, nullptr);
+       sr_log_callback_set(log_sr, nullptr);

 #ifdef ENABLE_DECODE
 #ifdef ENABLE_DECODE

-       srd_log_callback_set(log_libsrd, nullptr);
+       srd_log_callback_set(log_srd, nullptr);

 #endif
 
        GlobalSettings::add_change_handler(this);
 #endif
 
        GlobalSettings::add_change_handler(this);


@@ -129,7 +129,7 @@ void Logging::log_pv(QtMsgType type, const QMessageLogContext &context, const QS
        logging.log(msg, LogSource_pv);
 }
 
        logging.log(msg, LogSource_pv);
 }
 

-int Logging::log_libsigrok(void *cb_data, int loglevel, const char *format, va_list args)
+int Logging::log_sr(void *cb_data, int loglevel, const char *format, va_list args)

 {
        (void)cb_data;
        (void)loglevel;
 {
        (void)cb_data;
        (void)loglevel;


@@ -142,7 +142,7 @@ int Logging::log_libsigrok(void *cb_data, int loglevel, const char *format, va_l
 }
 
 #ifdef ENABLE_DECODE
 }
 
 #ifdef ENABLE_DECODE

-int Logging::log_libsrd(void *cb_data, int loglevel, const char *format, va_list args)
+int Logging::log_srd(void *cb_data, int loglevel, const char *format, va_list args)

 {
        (void)cb_data;
        (void)loglevel;
 {
        (void)cb_data;
        (void)loglevel;