From bb776d7b7348e8c7a24e2133d05c269ecae9e2ef Mon Sep 17 00:00:00 2001
From: Kristof Szabados <Kristof.Szabados@ericsson.com>
Date: Mon, 9 Dec 2019 15:21:44 +0100
Subject: [PATCH] minor simplification.
Signed-off-by: Kristof Szabados <Kristof.Szabados@ericsson.com>
---
core/Bitstring.cc | 12 ++++--------
core/Boolean.cc | 6 ++----
core/Charstring.cc | 6 ++----
core/Float.cc | 6 ++----
core/Hexstring.cc | 6 ++----
core/Integer.cc | 6 ++----
core/Octetstring.cc | 6 ++----
core/RAW.cc | 6 ++----
8 files changed, 18 insertions(+), 36 deletions(-)
diff --git a/core/Bitstring.cc b/core/Bitstring.cc
index 170e66823..9e1570866 100644
--- a/core/Bitstring.cc
+++ b/core/Bitstring.cc
@@ -1011,12 +1011,10 @@ int BITSTRING::RAW_encode(const TTCN_Typedescriptor_t& p_td, RAW_enc_tree& mylea
myleaf.must_free = FALSE;
myleaf.data_ptr_used = TRUE;
myleaf.body.leaf.data_ptr = val_ptr->bits_ptr;
- boolean orders = FALSE;
- if (p_td.raw->byteorder == ORDER_MSB) orders = TRUE;
+ boolean orders = p_td.raw->byteorder == ORDER_MSB;
if (p_td.raw->bitorderinfield == ORDER_LSB) orders = !orders;
myleaf.coding_par.byteorder = orders ? ORDER_MSB : ORDER_LSB;
- orders = FALSE;
- if (p_td.raw->bitorderinoctet == ORDER_MSB) orders = TRUE;
+ orders = p_td.raw->bitorderinoctet == ORDER_MSB;
if (p_td.raw->bitorderinfield == ORDER_LSB) orders = !orders;
myleaf.coding_par.bitorder = orders ? ORDER_MSB : ORDER_LSB;
myleaf.coding_par.csn1lh = p_td.raw->csn1lh;
@@ -1046,12 +1044,10 @@ int BITSTRING::RAW_decode(const TTCN_Typedescriptor_t& p_td, TTCN_Buffer& buff,
clean_up();
init_struct(decode_length);
RAW_coding_par cp;
- boolean orders = FALSE;
- if (p_td.raw->bitorderinoctet == ORDER_MSB) orders = TRUE;
+ boolean orders = p_td.raw->bitorderinoctet == ORDER_MSB;
if (p_td.raw->bitorderinfield == ORDER_LSB) orders = !orders;
cp.bitorder = orders ? ORDER_MSB : ORDER_LSB;
- orders = FALSE;
- if (p_td.raw->byteorder == ORDER_MSB) orders = TRUE;
+ orders = p_td.raw->byteorder == ORDER_MSB;
if (p_td.raw->bitorderinfield == ORDER_LSB) orders = !orders;
cp.byteorder = orders ? ORDER_MSB : ORDER_LSB;
cp.fieldorder = p_td.raw->fieldorder;
diff --git a/core/Boolean.cc b/core/Boolean.cc
index dc6162602..36540c535 100644
--- a/core/Boolean.cc
+++ b/core/Boolean.cc
@@ -609,12 +609,10 @@ int BOOLEAN::RAW_decode(const TTCN_Typedescriptor_t& p_td, TTCN_Buffer& buff,
else if (decode_length == 0) boolean_value = FALSE;
else {
RAW_coding_par cp;
- boolean orders = FALSE;
- if (p_td.raw->bitorderinoctet == ORDER_MSB) orders = TRUE;
+ boolean orders = p_td.raw->bitorderinoctet == ORDER_MSB;
if (p_td.raw->bitorderinfield == ORDER_MSB) orders = !orders;
cp.bitorder = orders ? ORDER_MSB : ORDER_LSB;
- orders = FALSE;
- if (p_td.raw->byteorder == ORDER_MSB) orders = TRUE;
+ orders = p_td.raw->byteorder == ORDER_MSB;
if (p_td.raw->bitorderinfield == ORDER_MSB) orders = !orders;
cp.byteorder = orders ? ORDER_MSB : ORDER_LSB;
cp.fieldorder = p_td.raw->fieldorder;
diff --git a/core/Charstring.cc b/core/Charstring.cc
index 53a933a66..7bd197d92 100644
--- a/core/Charstring.cc
+++ b/core/Charstring.cc
@@ -1580,12 +1580,10 @@ int CHARSTRING::RAW_decode(const TTCN_Typedescriptor_t& p_td,
decode_length = ((limit > (int) buff.unread_len_bit() ? (int)buff.unread_len_bit() : limit) / 8) * 8;
}
RAW_coding_par cp;
- boolean orders = FALSE;
- if (p_td.raw->bitorderinoctet == ORDER_MSB) orders = TRUE;
+ boolean orders = p_td.raw->bitorderinoctet == ORDER_MSB;
if (p_td.raw->bitorderinfield == ORDER_MSB) orders = !orders;
cp.bitorder = orders ? ORDER_MSB : ORDER_LSB;
- orders = FALSE;
- if (p_td.raw->byteorder == ORDER_MSB) orders = TRUE;
+ orders = p_td.raw->byteorder == ORDER_MSB;
if (p_td.raw->bitorderinfield == ORDER_MSB) orders = !orders;
cp.byteorder = orders ? ORDER_MSB : ORDER_LSB;
cp.fieldorder = p_td.raw->fieldorder;
diff --git a/core/Float.cc b/core/Float.cc
index 53f18f342..ccd41a746 100644
--- a/core/Float.cc
+++ b/core/Float.cc
@@ -791,12 +791,10 @@ int FLOAT::RAW_decode(const TTCN_Typedescriptor_t& p_td, TTCN_Buffer& buff,
double tmp = 0.0;
unsigned char data[16];
RAW_coding_par cp;
- boolean orders = FALSE;
- if (p_td.raw->bitorderinoctet == ORDER_MSB) orders = TRUE;
+ boolean orders = p_td.raw->bitorderinoctet == ORDER_MSB;
if (p_td.raw->bitorderinfield == ORDER_MSB) orders = !orders;
cp.bitorder = orders ? ORDER_MSB : ORDER_LSB;
- orders = FALSE;
- if (p_td.raw->byteorder == ORDER_MSB) orders = TRUE;
+ orders = p_td.raw->byteorder == ORDER_MSB;
if (p_td.raw->bitorderinfield == ORDER_MSB) orders = !orders;
cp.byteorder = orders ? ORDER_MSB : ORDER_LSB;
cp.fieldorder = p_td.raw->fieldorder;
diff --git a/core/Hexstring.cc b/core/Hexstring.cc
index c6999913d..778e276e1 100644
--- a/core/Hexstring.cc
+++ b/core/Hexstring.cc
@@ -805,12 +805,10 @@ int HEXSTRING::RAW_decode(const TTCN_Typedescriptor_t& p_td, TTCN_Buffer& buff,
? (int)buff.unread_len_bit() : limit) / 4) * 4;
}
RAW_coding_par cp;
- boolean orders = FALSE;
- if (p_td.raw->bitorderinoctet == ORDER_MSB) orders = TRUE;
+ boolean orders = p_td.raw->bitorderinoctet == ORDER_MSB;
if (p_td.raw->bitorderinfield == ORDER_MSB) orders = !orders;
cp.bitorder = orders ? ORDER_MSB : ORDER_LSB;
- orders = FALSE;
- if (p_td.raw->byteorder == ORDER_MSB) orders = TRUE;
+ orders = p_td.raw->byteorder == ORDER_MSB;
if (p_td.raw->bitorderinfield == ORDER_MSB) orders = !orders;
cp.byteorder = orders ? ORDER_MSB : ORDER_LSB;
cp.fieldorder = p_td.raw->fieldorder;
diff --git a/core/Integer.cc b/core/Integer.cc
index 2b22bde06..58c7c4d1e 100644
--- a/core/Integer.cc
+++ b/core/Integer.cc
@@ -1420,12 +1420,10 @@ int INTEGER::RAW_decode(const TTCN_Typedescriptor_t& p_td, TTCN_Buffer& buff,
int prepaddlength = buff.increase_pos_padd(p_td.raw->prepadding);
limit -= prepaddlength;
RAW_coding_par cp;
- boolean orders = FALSE;
- if (p_td.raw->bitorderinoctet == ORDER_MSB) orders = TRUE;
+ boolean orders = p_td.raw->bitorderinoctet == ORDER_MSB;
if (p_td.raw->bitorderinfield == ORDER_MSB) orders = !orders;
cp.bitorder = orders ? ORDER_MSB : ORDER_LSB;
- orders = FALSE;
- if (p_td.raw->byteorder == ORDER_MSB) orders = TRUE;
+ orders = p_td.raw->byteorder == ORDER_MSB;
if (p_td.raw->bitorderinfield == ORDER_MSB) orders = !orders;
cp.byteorder = orders ? ORDER_MSB : ORDER_LSB;
cp.fieldorder = p_td.raw->fieldorder;
diff --git a/core/Octetstring.cc b/core/Octetstring.cc
index dd62080cb..0d2228a42 100644
--- a/core/Octetstring.cc
+++ b/core/Octetstring.cc
@@ -1255,12 +1255,10 @@ int OCTETSTRING::RAW_decode(const TTCN_Typedescriptor_t& p_td,
? (int)buff.unread_len_bit() : limit) / 8) * 8;
}
RAW_coding_par cp;
- boolean orders = FALSE;
- if (p_td.raw->bitorderinoctet == ORDER_MSB) orders = TRUE;
+ boolean orders = p_td.raw->bitorderinoctet == ORDER_MSB;
if (p_td.raw->bitorderinfield == ORDER_MSB) orders = !orders;
cp.bitorder = orders ? ORDER_MSB : ORDER_LSB;
- orders = FALSE;
- if (p_td.raw->byteorder == ORDER_MSB) orders = TRUE;
+ orders = p_td.raw->byteorder == ORDER_MSB;
if (p_td.raw->bitorderinfield == ORDER_MSB) orders = !orders;
cp.byteorder = orders ? ORDER_MSB : ORDER_LSB;
cp.fieldorder = p_td.raw->fieldorder;
diff --git a/core/RAW.cc b/core/RAW.cc
index f417734e8..0742125a8 100644
--- a/core/RAW.cc
+++ b/core/RAW.cc
@@ -157,7 +157,6 @@ const unsigned char BitMaskTable[9]={
RAW_enc_tree::RAW_enc_tree(boolean is_leaf, RAW_enc_tree *par,
RAW_enc_tr_pos *par_pos, int my_pos, const TTCN_RAWdescriptor_t *raw_attr)
{
- boolean orders = FALSE;
isleaf = is_leaf;
must_free = FALSE;
data_ptr_used = FALSE;
@@ -182,11 +181,10 @@ RAW_enc_tree::RAW_enc_tree(boolean is_leaf, RAW_enc_tree *par,
ext_bit = raw_attr->extension_bit;
top_bit_order = raw_attr->top_bit_order;
calc = CALC_NO;
- if (raw_attr->byteorder == ORDER_MSB) orders = TRUE;
+ boolean orders = raw_attr->byteorder == ORDER_MSB;
if (raw_attr->bitorderinfield == ORDER_MSB) orders = !orders;
coding_par.byteorder = orders ? ORDER_MSB : ORDER_LSB;
- orders = FALSE;
- if (raw_attr->bitorderinoctet == ORDER_MSB) orders = TRUE;
+ orders = raw_attr->bitorderinoctet == ORDER_MSB;
if (raw_attr->bitorderinfield == ORDER_MSB) orders = !orders;
coding_par.bitorder = orders ? ORDER_MSB : ORDER_LSB;
coding_par.hexorder = raw_attr->hexorder;
--
GitLab