From: Uwe Hermann <redacted>
Date: Fri, 30 Mar 2018 20:27:29 +0000 (+0200)
Subject: logging: Minor consistency fixes.
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=348bae08c18c66974533dde20ba3c426e881f929;p=pulseview.git

logging: Minor consistency fixes.
---

diff --git a/pv/logging.cpp b/pv/logging.cpp
index b0355168..1d4eb7c9 100644
--- a/pv/logging.cpp
+++ b/pv/logging.cpp
@@ -55,9 +55,9 @@ void Logging::init()
 	buffer_.reserve(buffer_size_);
 
 	qInstallMessageHandler(log_pv);
-	sr_log_callback_set(log_libsigrok, nullptr);
+	sr_log_callback_set(log_sr, nullptr);
 #ifdef ENABLE_DECODE
-	srd_log_callback_set(log_libsrd, nullptr);
+	srd_log_callback_set(log_srd, nullptr);
 #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);
 }
 
-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;
@@ -142,7 +142,7 @@ int Logging::log_libsigrok(void *cb_data, int loglevel, const char *format, va_l
 }
 
 #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;
diff --git a/pv/logging.hpp b/pv/logging.hpp
index 69957627..0be270d4 100644
--- a/pv/logging.hpp
+++ b/pv/logging.hpp
@@ -55,10 +55,10 @@ public:
 
 	static void log_pv(QtMsgType type, const QMessageLogContext &context, const QString &msg);
 
-	static int log_libsigrok(void *cb_data, int loglevel, const char *format, va_list args);
+	static int log_sr(void *cb_data, int loglevel, const char *format, va_list args);
 
 #ifdef ENABLE_DECODE
-	static int log_libsrd(void *cb_data, int loglevel, const char *format, va_list args);
+	static int log_srd(void *cb_data, int loglevel, const char *format, va_list args);
 #endif
 
 private: