mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-02-23 09:41:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

use strncmp instead of memcmp

Browse Source
This commit is contained in:
Matthias Ringwald 2015-11-18 13:44:57 +01:00
parent ae245cdf0a
commit a2836118fa
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/hfp/hfp_ag_client_test.c
View File

@ -108,7 +108,7 @@ int expected_rfcomm_command(const char * expected_cmd){
if ( (ag_cmd+i)[0] == '\r' || (ag_cmd+i)[0] == '\n' ) {
continue;
}
if (memcmp(ag_cmd + i, expected_cmd, expected_len) == 0) return 1;
if (strncmp(ag_cmd + i, expected_cmd, expected_len) == 0) return 1;
}
return 0;
}
@ -119,9 +119,9 @@ void simulate_test_sequence(char ** test_steps, int nr_test_steps){
for (i=0; i < nr_test_steps; i++){
char * cmd = test_steps[i];
printf("\n---> NEXT STEP %s\n", cmd);
if (memcmp(cmd, "AT", 2) == 0){
if (strncmp(cmd, "AT", 2) == 0){
inject_rfcomm_command_to_ag((uint8_t*)cmd, strlen(cmd));
} else if (memcmp(cmd, "NOP", 3) == 0){
} else if (strncmp(cmd, "NOP", 3) == 0){
inject_rfcomm_command_to_ag((uint8_t*)"NOP",3);
} else {
int expected_cmd = expected_rfcomm_command(cmd);

12
test/hfp/hfp_hf_client_test.c
View File

@ -81,7 +81,7 @@ int expected_rfcomm_command(const char * cmd){
int offset = 2;
int cmd_size = strlen(cmd);
int cmd_found = memcmp(ag_cmd+offset, cmd, cmd_size) == 0;
int cmd_found = strncmp(ag_cmd+offset, cmd, cmd_size) == 0;
while (!cmd_found && get_rfcomm_payload_len() - cmd_size >= offset){
offset++;
cmd_found = strncmp(ag_cmd+offset, cmd, cmd_size) == 0;
@ -89,17 +89,17 @@ int expected_rfcomm_command(const char * cmd){
if (!cmd_found) return 0;
// AG cmds that are not followed by OK
if (memcmp(ag_cmd+offset, "+BCS", 4) == 0){
if (strncmp(ag_cmd+offset, "+BCS", 4) == 0){
return cmd_found;
}
offset += strlen(cmd)+4;
// printf("cmd found, offset %d, cmd %s\n", offset, ag_cmd+offset);
int ok_found = memcmp(ag_cmd+offset, "OK", 2) == 0;
int ok_found = strncmp(ag_cmd+offset, "OK", 2) == 0;
while (!ok_found && get_rfcomm_payload_len() - 2 >= offset){
offset++;
// printf("cmd found, offset %d, cmd %s\n", offset, ag_cmd+offset);
ok_found = memcmp(ag_cmd+offset, "OK", 2) == 0;
ok_found = strncmp(ag_cmd+offset, "OK", 2) == 0;
}
// printf("cmd found, ok found %d\n", ok_found);
return cmd_found && ok_found;
@ -110,10 +110,10 @@ void simulate_test_sequence(char ** test_steps, int nr_test_steps){
for (i=0; i < nr_test_steps; i++){
char * cmd = test_steps[i];
printf("\n---> NEXT STEP %s\n", cmd);
if (memcmp(cmd, "AT", 2) == 0){
if (strncmp(cmd, "AT", 2) == 0){
int parsed_codecs[2];
uint8_t new_codecs[2];
if (memcmp(cmd, "AT+BAC=", 7) == 0){
if (strncmp(cmd, "AT+BAC=", 7) == 0){
printf("Send BAC\n");
sscanf(&cmd[7],"%d,%d", &parsed_codecs[0], &parsed_codecs[1]);
new_codecs[0] = parsed_codecs[0];