Change in osmo-pcu[master]: EDGE tests: remove no-op check
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
Gerrit-Reviewer: Daniel Willmann
Gerrit-Reviewer: Harald Welte
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max
Gerrit-Reviewer: Pau Espin Pedrol
Gerrit-Reviewer: osmith
Change in osmo-pcu[master]: EDGE tests: remove no-op check
Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/13052 ) Change subject: EDGE tests: remove no-op check .. Patch Set 2: Code-Review+2 -- 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: comment Gerrit-Change-Id: Ie0f81fe05a2b3f432de7d1f3446e8115d7524ff4 Gerrit-Change-Number: 13052 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Daniel Willmann Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 05 Mar 2019 20:46:48 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-pcu[master]: EDGE tests: remove no-op check
osmith has posted comments on this change. ( https://gerrit.osmocom.org/13052 ) Change subject: EDGE tests: remove no-op check .. Patch Set 2: Code-Review+1 -- 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: comment Gerrit-Change-Id: Ie0f81fe05a2b3f432de7d1f3446e8115d7524ff4 Gerrit-Change-Number: 13052 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Daniel Willmann Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 05 Mar 2019 15:22:26 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-pcu[master]: EDGE tests: remove no-op check
Hello Pau Espin Pedrol, Daniel Willmann, Harald Welte, osmith, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/13052 to look at the new patch set (#2). 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(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/52/13052/2 -- 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: newpatchset Gerrit-Change-Id: Ie0f81fe05a2b3f432de7d1f3446e8115d7524ff4 Gerrit-Change-Number: 13052 Gerrit-PatchSet: 2 Gerrit-Owner: Max Gerrit-Reviewer: Daniel Willmann Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith
Change in osmo-pcu[master]: EDGE tests: remove no-op check
Max has posted comments on this change. ( https://gerrit.osmocom.org/13052 ) Change subject: EDGE tests: remove no-op check .. Patch Set 1: > maybe this is to present a unified interface of GPRS and EGPRS coding? Maybe > there are (future) cases where the return isn't envisioned as being const? Maybe so but I'm not sure that the envisioned future implementation will use headerType*() functions which expose rather low-level details like particular enum values. Hence I think it might be still beneficial to get rid of it now because there're no comments clarifying the actual intention. -- 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: comment Gerrit-Change-Id: Ie0f81fe05a2b3f432de7d1f3446e8115d7524ff4 Gerrit-Change-Number: 13052 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Daniel Willmann Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 05 Mar 2019 11:07:57 + Gerrit-HasComments: No Gerrit-HasLabels: No
Change in osmo-pcu[master]: EDGE tests: remove no-op check
Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/13052 ) Change subject: EDGE tests: remove no-op check .. Patch Set 1: maybe this is to present a unified interface of GPRS and EGPRS coding? Maybe there are (future) cases where the return isn't envisioned as being const? -- 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: comment Gerrit-Change-Id: Ie0f81fe05a2b3f432de7d1f3446e8115d7524ff4 Gerrit-Change-Number: 13052 Gerrit-PatchSet: 1 Gerrit-Owner: Max Gerrit-Reviewer: Daniel Willmann Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 26 Feb 2019 22:52:28 + Gerrit-HasComments: No Gerrit-HasLabels: No
Change in osmo-pcu[master]: EDGE tests: remove no-op check
Max has uploaded this change for review. ( 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(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/52/13052/1
diff --git a/src/gprs_coding_scheme.h b/src/gprs_coding_scheme.h
index 76cab0f..62cbb85 100644
--- a/src/gprs_coding_scheme.h
+++ b/src/gprs_coding_scheme.h
@@ -107,7 +107,6 @@
uint8_t optionalPaddingBits() const;
const char *name() const;
HeaderType headerTypeData() const;
- HeaderType headerTypeControl() const;
Family family() const;
static GprsCodingScheme getBySizeUL(unsigned size);
@@ -154,11 +153,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: newchange
Gerrit-Change-Id: Ie0f81fe05a2b3f432de7d1f3446e8115d7524ff4
Gerrit-Change-Number: 13052
Gerrit-PatchSet: 1
Gerrit-Owner: Max
