From 01f9bc7bf196484aa22f63934b73ee2d1f7e82c9 Mon Sep 17 00:00:00 2001 From: Max Date: Tue, 5 Mar 2019 12:09:57 +0100 Subject: 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 --- src/gprs_coding_scheme.h | 6 ------ tests/edge/EdgeTest.cpp | 2 -- 2 files changed, 8 deletions(-) diff --git a/src/gprs_coding_scheme.h b/src/gprs_coding_scheme.h index 1acb14bc..31f09402 100644 --- a/src/gprs_coding_scheme.h +++ b/src/gprs_coding_scheme.h @@ -100,7 +100,6 @@ public: 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 @@ inline bool GprsCodingScheme::isCompatible(GprsCodingScheme o) const 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 6ce23348..0cb123e4 100644 --- a/tests/edge/EdgeTest.cpp +++ b/tests/edge/EdgeTest.cpp @@ -170,8 +170,6 @@ static void test_coding_scheme() /* 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); } -- cgit v1.2.3