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

Removed unnecessary memsets of ATHandler's receving buffer

pull/6082/head
Mirela Chirica 2018-02-16 11:13:31 +02:00 committed by Ari Parkkila
parent d15801d893
commit 1825c999a9
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
features/cellular/framework/AT/ATHandler.cpp
View File

@ -241,7 +241,7 @@ void ATHandler::process_oob()
break; break;
} }
// If no match found, look for CRLF and consume everything up to CRLF // If no match found, look for CRLF and consume everything up to CRLF
if (mem_str(_recv_buff, sizeof(_recv_buff), CRLF, CRLF_LENGTH)) { if (mem_str(_recv_buff, _recv_len, CRLF, CRLF_LENGTH)) {
consume_to_tag(CRLF, true); consume_to_tag(CRLF, true);
} else { } else {
if (_fileHandle->readable()) { if (_fileHandle->readable()) {
@ -274,7 +274,6 @@ void ATHandler::set_filehandle_sigio()
void ATHandler::reset_buffer() void ATHandler::reset_buffer()
{ {
log_debug("%s", __func__); log_debug("%s", __func__);
memset(_recv_buff, 0, sizeof(_recv_buff));
_recv_pos = 0; _recv_len = 0; _recv_pos = 0; _recv_len = 0;
} }
@ -286,8 +285,6 @@ void ATHandler::rewind_buffer()
// move what is not read to beginning of buffer // move what is not read to beginning of buffer
memmove(_recv_buff, _recv_buff + _recv_pos, _recv_len); memmove(_recv_buff, _recv_buff + _recv_pos, _recv_len);
_recv_pos = 0; _recv_pos = 0;
// reset rest of buffer
memset(_recv_buff + _recv_len, 0, sizeof(_recv_buff) - _recv_len);
} }
} }
@ -706,7 +703,7 @@ void ATHandler::resp(const char *prefix, bool check_urc)
} }
// If no match found, look for CRLF and consume everything up to and including CRLF // If no match found, look for CRLF and consume everything up to and including CRLF
if (mem_str(_recv_buff, sizeof(_recv_buff), CRLF, CRLF_LENGTH)) { if (mem_str(_recv_buff, _recv_len, CRLF, CRLF_LENGTH)) {
// If no prefix, return on CRLF - means data to read // If no prefix, return on CRLF - means data to read
if (!prefix) { if (!prefix) {
return; return;
@ -924,12 +921,15 @@ void ATHandler::set_string(char *dest, const char *src, size_t src_len)
const char* ATHandler::mem_str(const char* dest, size_t dest_len, const char* src, size_t src_len) const char* ATHandler::mem_str(const char* dest, size_t dest_len, const char* src, size_t src_len)
{ {
for(size_t i = 0; i < dest_len-src_len; ++i) { if (dest_len > src_len) {
if(memcmp(dest+i, src, src_len) == 0) { for(size_t i = 0; i < dest_len-src_len; ++i) {
return dest+i; if(memcmp(dest+i, src, src_len) == 0) {
} at_debug("mem_str i: %d", i);
} return dest+i;
return NULL; }
}
}
return NULL;
} }
void ATHandler::cmd_start(const char* cmd) void ATHandler::cmd_start(const char* cmd)