@@ -177,34 +177,29 @@ CBORMessageDecoder::ArrayParserState CBORMessageDecoder::decodeLastValuesUpdateC
177
177
}
178
178
179
179
CBORMessageDecoder::ArrayParserState CBORMessageDecoder::decodeOtaUpdateCmdDown (CborValue * param, Message * message) {
180
+ CborError error = CborNoError;
180
181
OtaUpdateCmdDown * ota = (OtaUpdateCmdDown *) message;
181
182
182
183
// Message is composed 4 parameters: id, url, initialSha, finalSha
183
184
if (!copyCBORByteToArray (param, ota->params .id , sizeof (ota->params .id ))) {
184
185
return ArrayParserState::Error;
185
186
}
186
187
187
- if (cbor_value_advance (param) != CborNoError) {
188
- return ArrayParserState::Error;
189
- }
188
+ error = cbor_value_advance (param);
190
189
191
- if (!copyCBORStringToArray (param, ota->params .url , sizeof (ota->params .url ))) {
190
+ if (error || !copyCBORStringToArray (param, ota->params .url , sizeof (ota->params .url ))) {
192
191
return ArrayParserState::Error;
193
192
}
194
193
195
- if (cbor_value_advance (param) != CborNoError) {
196
- return ArrayParserState::Error;
197
- }
194
+ error = cbor_value_advance (param);
198
195
199
- if (!copyCBORByteToArray (param, ota->params .initialSha256 , sizeof (ota->params .initialSha256 ))) {
196
+ if (error || !copyCBORByteToArray (param, ota->params .initialSha256 , sizeof (ota->params .initialSha256 ))) {
200
197
return ArrayParserState::Error;
201
198
}
202
199
203
- if (cbor_value_advance (param) != CborNoError) {
204
- return ArrayParserState::Error;
205
- }
200
+ error = cbor_value_advance (param);
206
201
207
- if (!copyCBORByteToArray (param, ota->params .finalSha256 , sizeof (ota->params .finalSha256 ))) {
202
+ if (error || !copyCBORByteToArray (param, ota->params .finalSha256 , sizeof (ota->params .finalSha256 ))) {
208
203
return ArrayParserState::Error;
209
204
}
210
205
0 commit comments