ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

sms gt tests: rebase and astyle fix

pull/7753/head
Teemu Kultala 2018-08-07 16:34:46 +03:00 committed by adbridge
parent 7d2d835687
commit 3608cc78ce
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
features/cellular/framework/AT/AT_CellularSMS.cpp
View File

@ -641,10 +641,10 @@ nsapi_size_or_error_t AT_CellularSMS::read_sms_from_index(int msg_index, char *b
_at.skip_param(); // <alpha> _at.skip_param(); // <alpha>
if (time_stamp) { if (time_stamp) {
int len = _at.read_string(time_stamp, SMS_MAX_TIME_STAMP_SIZE); int len = _at.read_string(time_stamp, SMS_MAX_TIME_STAMP_SIZE);
if (len < SMS_MAX_TIME_STAMP_SIZE-2) { if (len < (SMS_MAX_TIME_STAMP_SIZE - 2)) {
time_stamp[len++] = ','; time_stamp[len++] = ',';
_at.read_string(&time_stamp[len], SMS_MAX_TIME_STAMP_SIZE-len); _at.read_string(&time_stamp[len], SMS_MAX_TIME_STAMP_SIZE-len);
} }
} }
(void)_at.consume_to_stop_tag(); // consume until <CR><LF> (void)_at.consume_to_stop_tag(); // consume until <CR><LF>
if (buf) { if (buf) {
@ -804,10 +804,10 @@ nsapi_size_or_error_t AT_CellularSMS::get_data_from_pdu(const char *pdu, sms_inf
index += 2; // we just read the high bits of first octet so move +2 index += 2; // we just read the high bits of first octet so move +2
// originating address length // originating address length
oaLength = hex_str_to_int(pdu+index, 2); oaLength = hex_str_to_int(pdu + index, 2);
index +=2; // add index over address length index += 2; // add index over address length
int type = hex_str_to_int(pdu+index, 1); int type = hex_str_to_int(pdu + index, 1);
index +=2; // add index over type index += 2; // add index over type
if (phone_number) { if (phone_number) {
// phone number as reverse nibble encoded // phone number as reverse nibble encoded
int a = 0, field_length = oaLength; int a = 0, field_length = oaLength;
@ -818,13 +818,13 @@ nsapi_size_or_error_t AT_CellularSMS::get_data_from_pdu(const char *pdu, sms_inf
field_length++; field_length++;
} }
for (; a < field_length; a +=2) { for (; a < field_length; a += 2) {
if (a+1 == field_length) { if ((a + 1) == field_length) {
phone_number[a] = pdu[index+1]; phone_number[a] = pdu[index + 1];
index++; index++;
} else { } else {
phone_number[a] = pdu[index+1]; phone_number[a] = pdu[index + 1];
phone_number[a+1] = pdu[index]; phone_number[a + 1] = pdu[index];
index += 2; index += 2;
} }
} }
@ -834,7 +834,6 @@ nsapi_size_or_error_t AT_CellularSMS::get_data_from_pdu(const char *pdu, sms_inf
} }
index += oaLength;
if (oaLength & 0x01) { // if phone number length is odd then it has padded F so skip that if (oaLength & 0x01) { // if phone number length is odd then it has padded F so skip that
index++; index++;
} }