Change in osmo-pcu[master]: EDGE tests: remove no-op check

Harald Welte gerrit-no-reply at lists.osmocom.org
Tue Mar 5 20:46:50 UTC 2019


Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/13052 )

Change subject: EDGE tests: remove no-op check
......................................................................

EDGE tests: remove no-op check

The headerTypeControl() function always return constant and is only used
inside OSMO_ASSERT() which compares it to the very same constant which
makes it no-op. Let's remove this clutter.

Change-Id: Ie0f81fe05a2b3f432de7d1f3446e8115d7524ff4
---
M src/gprs_coding_scheme.h
M tests/edge/EdgeTest.cpp
2 files changed, 0 insertions(+), 8 deletions(-)

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



diff --git a/src/gprs_coding_scheme.h b/src/gprs_coding_scheme.h
index 1acb14b..31f0940 100644
--- a/src/gprs_coding_scheme.h
+++ b/src/gprs_coding_scheme.h
@@ -100,7 +100,6 @@
 	uint8_t optionalPaddingBits() const;
 	const char *name() const;
 	HeaderType headerTypeData() const;
-	HeaderType headerTypeControl() const;
 
 	static GprsCodingScheme getBySizeUL(unsigned size);
 	static GprsCodingScheme getGprsByNum(unsigned num);
@@ -146,11 +145,6 @@
 	return (isGprs() && o.isGprs()) || (isEgprs() && o.isEgprs());
 }
 
-inline GprsCodingScheme::HeaderType GprsCodingScheme::headerTypeControl() const
-{
-	return HEADER_GPRS_CONTROL;
-}
-
 inline GprsCodingScheme::GprsCodingScheme(Scheme s)
 	: m_scheme(s)
 {
diff --git a/tests/edge/EdgeTest.cpp b/tests/edge/EdgeTest.cpp
index 6ce2334..0cb123e 100644
--- a/tests/edge/EdgeTest.cpp
+++ b/tests/edge/EdgeTest.cpp
@@ -170,8 +170,6 @@
 		/* Check header types */
 		OSMO_ASSERT(current_cs.headerTypeData() ==
 			GprsCodingScheme::HEADER_GPRS_DATA);
-		OSMO_ASSERT(current_cs.headerTypeControl() ==
-			GprsCodingScheme::HEADER_GPRS_CONTROL);
 
 		check_coding_scheme(current_cs, GprsCodingScheme::GPRS);
 	}

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

Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie0f81fe05a2b3f432de7d1f3446e8115d7524ff4
Gerrit-Change-Number: 13052
Gerrit-PatchSet: 2
Gerrit-Owner: Max <msuraev at sysmocom.de>
Gerrit-Reviewer: Daniel Willmann <dwillmann at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder (1000002)
Gerrit-Reviewer: Max <msuraev at sysmocom.de>
Gerrit-Reviewer: Pau Espin Pedrol <pespin at sysmocom.de>
Gerrit-Reviewer: osmith <osmith at sysmocom.de>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20190305/c3691031/attachment.html>


More information about the gerrit-log mailing list