Use bool variables to make if condition more readable

pennam · pennam · commit 31cd66764156 · 2021-12-22T10:37:11.000+01:00
diff --git a/src/cbor/CBOREncoder.cpp b/src/cbor/CBOREncoder.cpp
@@ -59,7 +59,9 @@ CborError CBOREncoder::encode(PropertyContainer & property_container, uint8_t *
                 property_container.end(),
                 [lightPayload, &arrayEncoder, &error, &num_encoded_properties, &num_checked_properties](Property * p)
                 {
-                  if((error == CborNoError) && ((num_encoded_properties < encoded_properties_message_limit) || (encoded_properties_message_limit == CBOR_ENCODER_NO_PROPERTIES_LIMIT)))
+                  bool maximum_number_of_properties_reached = (num_encoded_properties >= encoded_properties_message_limit) && (encoded_properties_message_limit != CBOR_ENCODER_NO_PROPERTIES_LIMIT);
+                  bool cbor_encoder_error = (error != CborNoError);
+                  if((!cbor_encoder_error) && (!maximum_number_of_properties_reached))
                   {
                     if (p->shouldBeUpdated() && p->isReadableByCloud())
                     {

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,9 @@ CborError CBOREncoder::encode(PropertyContainer & property_container, uint8_t *`
`59`	`59`	`property_container.end(),`
`60`	`60`	`[lightPayload, &arrayEncoder, &error, &num_encoded_properties, &num_checked_properties](Property * p)`
`61`	`61`	`{`
`62`		`- if((error == CborNoError) && ((num_encoded_properties < encoded_properties_message_limit) \|\| (encoded_properties_message_limit == CBOR_ENCODER_NO_PROPERTIES_LIMIT)))`
	`62`	`+ bool maximum_number_of_properties_reached = (num_encoded_properties >= encoded_properties_message_limit) && (encoded_properties_message_limit != CBOR_ENCODER_NO_PROPERTIES_LIMIT);`
	`63`	`+ bool cbor_encoder_error = (error != CborNoError);`
	`64`	`+ if((!cbor_encoder_error) && (!maximum_number_of_properties_reached))`
`63`	`65`	`{`
`64`	`66`	`if (p->shouldBeUpdated() && p->isReadableByCloud())`
`65`	`67`	`{`