Change in osmo-trx[master]: cosmetic: uhd: Use loglevel ERROR instead of ERR

Pau Espin Pedrol gerrit-no-reply at lists.osmocom.org
Fri May 3 18:26:14 UTC 2019


Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/13829 )

Change subject: cosmetic: uhd: Use loglevel ERROR instead of ERR
......................................................................

cosmetic: uhd: Use loglevel ERROR instead of ERR

ERR is osmo-trx legacy level, which actually converts to osmocom's
ERROR, so let's use that one directly.

Change-Id: I82f6f89a725bea7f7acfa455c20cf922cc3f8a00
---
M Transceiver52M/device/uhd/UHDDevice.cpp
1 file changed, 11 insertions(+), 11 deletions(-)

Approvals:
  Jenkins Builder: Verified
  Harald Welte: Looks good to me, approved
  tnt: Looks good to me, but someone else must approve
  Vadim Yanitskiy: Looks good to me, but someone else must approve



diff --git a/Transceiver52M/device/uhd/UHDDevice.cpp b/Transceiver52M/device/uhd/UHDDevice.cpp
index 40ef2a0..34ffd57 100644
--- a/Transceiver52M/device/uhd/UHDDevice.cpp
+++ b/Transceiver52M/device/uhd/UHDDevice.cpp
@@ -149,7 +149,7 @@
 		LOGC(DDEV, WARNING) << msg;
 		break;
 	case uhd::msg::error:
-		LOGC(DDEV, ERR) << msg;
+		LOGC(DDEV, ERROR) << msg;
 		break;
 	case uhd::msg::fastpath:
 		break;
@@ -601,7 +601,7 @@
 	LOGC(DDEV, INFO) << "Starting USRP...";
 
 	if (started) {
-		LOGC(DDEV, ERR) << "Device already started";
+		LOGC(DDEV, ERROR) << "Device already started";
 		return false;
 	}
 
@@ -652,7 +652,7 @@
 int uhd_device::check_rx_md_err(uhd::rx_metadata_t &md, ssize_t num_smpls)
 {
 	if (!num_smpls) {
-		LOGC(DDEV, ERR) << str_code(md);
+		LOGC(DDEV, ERROR) << str_code(md);
 
 		switch (md.error_code) {
 		case uhd::rx_metadata_t::ERROR_CODE_TIMEOUT:
@@ -715,8 +715,8 @@
 	// Check that timestamp is valid
 	rc = rx_buffers[0]->avail_smpls(timestamp);
 	if (rc < 0) {
-		LOGC(DDEV, ERR) << rx_buffers[0]->str_code(rc);
-		LOGC(DDEV, ERR) << rx_buffers[0]->str_status(timestamp);
+		LOGC(DDEV, ERROR) << rx_buffers[0]->str_code(rc);
+		LOGC(DDEV, ERROR) << rx_buffers[0]->str_status(timestamp);
 		return 0;
 	}
 
@@ -763,8 +763,8 @@
 
 			// Continue on local overrun, exit on other errors
 			if ((rc < 0)) {
-				LOGC(DDEV, ERR) << rx_buffers[i]->str_code(rc);
-				LOGC(DDEV, ERR) << rx_buffers[i]->str_status(timestamp);
+				LOGC(DDEV, ERROR) << rx_buffers[i]->str_code(rc);
+				LOGC(DDEV, ERROR) << rx_buffers[i]->str_status(timestamp);
 				if (rc != smpl_buf::ERROR_OVERFLOW)
 					return 0;
 			}
@@ -775,8 +775,8 @@
 	for (size_t i = 0; i < rx_buffers.size(); i++) {
 		rc = rx_buffers[i]->read(bufs[i], len, timestamp);
 		if ((rc < 0) || (rc != len)) {
-			LOGC(DDEV, ERR) << rx_buffers[i]->str_code(rc);
-			LOGC(DDEV, ERR) << rx_buffers[i]->str_status(timestamp);
+			LOGC(DDEV, ERROR) << rx_buffers[i]->str_code(rc);
+			LOGC(DDEV, ERROR) << rx_buffers[i]->str_status(timestamp);
 			return 0;
 		}
 	}
@@ -797,7 +797,7 @@
 
 	// No control packets
 	if (isControl) {
-		LOGC(DDEV, ERR) << "Control packets not supported";
+		LOGC(DDEV, ERROR) << "Control packets not supported";
 		return 0;
 	}
 
@@ -1110,7 +1110,7 @@
 
 		if ((md.event_code != uhd::async_metadata_t::EVENT_CODE_UNDERFLOW) &&
 		    (md.event_code != uhd::async_metadata_t::EVENT_CODE_TIME_ERROR)) {
-			LOGC(DDEV, ERR) << str_code(md);
+			LOGC(DDEV, ERROR) << str_code(md);
 		}
 	}
 

-- 
To view, visit https://gerrit.osmocom.org/13829
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I82f6f89a725bea7f7acfa455c20cf922cc3f8a00
Gerrit-Change-Number: 13829
Gerrit-PatchSet: 2
Gerrit-Owner: Pau Espin Pedrol <pespin at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder (1000002)
Gerrit-Reviewer: Pau Espin Pedrol <pespin at sysmocom.de>
Gerrit-Reviewer: Vadim Yanitskiy <axilirator at gmail.com>
Gerrit-Reviewer: tnt <tnt at 246tNt.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20190503/b5d834ee/attachment.html>


More information about the gerrit-log mailing list