mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-01-31 00:32:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

pbap_client: use switch in pbap_client_process_vcard_listing, delete unused code

Browse Source
This commit is contained in:
Matthias Ringwald 2021-11-24 11:37:33 +01:00
parent 74492e8dd1
commit 7687f39512
1 changed files with 62 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

122
src/classic/pbap_client.c
View File

@ -584,62 +584,73 @@ static void pbap_process_srm_headers(pbap_client_t * context, uint8_t *packet, u
static void pbap_client_process_vcard_listing(uint8_t *packet, uint16_t size){
obex_iterator_t it;
for (obex_iterator_init_with_response_packet(&it, goep_client_get_request_opcode(pbap_client->goep_cid), packet, size); obex_iterator_has_more(&it) ; obex_iterator_next(&it)){
uint8_t hi = obex_iterator_get_hi(&it);
if ((hi == OBEX_HEADER_END_OF_BODY) ||
(hi == OBEX_HEADER_BODY)){
uint16_t data_len = obex_iterator_get_data_len(&it);
const uint8_t * data = obex_iterator_get_data(&it);
// now try parsing it
uint16_t char_len;
while (data_len--){
yxml_ret_t r = yxml_parse(&pbap_client->xml_parser, *data++);
switch (r){
case YXML_ELEMSTART:
pbap_client->parser_card_found = strcmp("card", pbap_client->xml_parser.elem) == 0;
break;
case YXML_ELEMEND:
if (pbap_client->parser_card_found){
pbap_client_emit_card_result_event(pbap_client, pbap_client->parser_name, pbap_client->parser_handle);
}
pbap_client->parser_card_found = false;
break;
case YXML_ATTRSTART:
if (!pbap_client->parser_card_found) break;
if (strcmp("name", pbap_client->xml_parser.attr) == 0){
pbap_client->parser_name_found = true;
pbap_client->parser_name[0] = 0;
uint8_t hi = obex_iterator_get_hi(&it);
uint16_t data_len = obex_iterator_get_data_len(&it);
const uint8_t * data = obex_iterator_get_data(&it);
uint16_t char_len;
switch (hi){
case OBEX_HEADER_BODY:
case OBEX_HEADER_END_OF_BODY:
// now try parsing it
while (data_len--) {
yxml_ret_t r = yxml_parse(&pbap_client->xml_parser, *data++);
switch (r) {
case YXML_ELEMSTART:
pbap_client->parser_card_found = strcmp("card", pbap_client->xml_parser.elem) == 0;
break;
}
if (strcmp("handle", pbap_client->xml_parser.attr) == 0){
pbap_client->parser_handle_found = true;
pbap_client->parser_handle[0] = 0;
case YXML_ELEMEND:
if (pbap_client->parser_card_found) {
pbap_client_emit_card_result_event(pbap_client, pbap_client->parser_name,
pbap_client->parser_handle);
}
pbap_client->parser_card_found = false;
break;
}
break;
case YXML_ATTRVAL:
if (pbap_client->parser_name_found) {
// "In UTF-8, characters from the U+0000..U+10FFFF range (the UTF-16 accessible range) are encoded using sequences of 1 to 4 octets."
char_len = strlen(pbap_client->xml_parser.data);
if ((strlen(pbap_client->parser_name) + char_len + 1) >= sizeof(pbap_client->parser_name)) break;
strcat(pbap_client->parser_name, pbap_client->xml_parser.data);
case YXML_ATTRSTART:
if (!pbap_client->parser_card_found) break;
if (strcmp("name", pbap_client->xml_parser.attr) == 0) {
pbap_client->parser_name_found = true;
pbap_client->parser_name[0] = 0;
break;
}
if (strcmp("handle", pbap_client->xml_parser.attr) == 0) {
pbap_client->parser_handle_found = true;
pbap_client->parser_handle[0] = 0;
break;
}
break;
}
if (pbap_client->parser_handle_found) {
// "In UTF-8, characters from the U+0000..U+10FFFF range (the UTF-16 accessible range) are encoded using sequences of 1 to 4 octets."
char_len = strlen(pbap_client->xml_parser.data);
if ((strlen(pbap_client->parser_handle) + char_len + 1) >= sizeof(pbap_client->parser_handle)) break;
strcat(pbap_client->parser_handle, pbap_client->xml_parser.data);
case YXML_ATTRVAL:
if (pbap_client->parser_name_found) {
// "In UTF-8, characters from the U+0000..U+10FFFF range (the UTF-16 accessible range) are encoded using sequences of 1 to 4 octets."
char_len = strlen(pbap_client->xml_parser.data);
if ((strlen(pbap_client->parser_name) + char_len + 1) >=
sizeof(pbap_client->parser_name))
break;
strcat(pbap_client->parser_name, pbap_client->xml_parser.data);
break;
}
if (pbap_client->parser_handle_found) {
// "In UTF-8, characters from the U+0000..U+10FFFF range (the UTF-16 accessible range) are encoded using sequences of 1 to 4 octets."
char_len = strlen(pbap_client->xml_parser.data);
if ((strlen(pbap_client->parser_handle) + char_len + 1) >=
sizeof(pbap_client->parser_handle))
break;
strcat(pbap_client->parser_handle, pbap_client->xml_parser.data);
break;
}
break;
}
break;
case YXML_ATTREND:
pbap_client->parser_name_found = false;
pbap_client->parser_handle_found = false;
break;
default:
break;
case YXML_ATTREND:
pbap_client->parser_name_found = false;
pbap_client->parser_handle_found = false;
break;
default:
break;
}
}
}
break;
default:
break;
}
}
}
@ -855,15 +866,6 @@ static void pbap_packet_handler_goep(uint8_t *packet, uint16_t size){
}
break;
case OBEX_RESP_SUCCESS:
for (obex_iterator_init_with_response_packet(&it, goep_client_get_request_opcode(pbap_client->goep_cid), packet, size); obex_iterator_has_more(&it) ; obex_iterator_next(&it)){
uint8_t hi = obex_iterator_get_hi(&it);
if ((hi == OBEX_HEADER_END_OF_BODY) ||
(hi == OBEX_HEADER_BODY)){
// uint16_t data_len = obex_iterator_get_data_len(&it);
// const uint8_t * data = obex_iterator_get_data(&it);
// now try parsing it
}
}
pbap_client->state = PBAP_CONNECTED;
pbap_client_emit_operation_complete_event(pbap_client, 0);
break;