mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-03-14 10:21:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

classic: fix more warnings

Browse Source
This commit is contained in:
Matthias Ringwald 2022-06-09 16:08:37 +02:00
parent ab2445a020
commit b56e8b561b
9 changed files with 37 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/classic/bnep.c
View File

@ -1040,14 +1040,15 @@ static int bnep_handle_multi_addr_set(bnep_channel_t *channel, uint8_t *packet,
}
/* Check if we have enough space for more filters */
if ((list_length / (2 * ETHER_ADDR_LEN)) > MAX_BNEP_MULTICAST_FILTER) {
uint16_t list_count = list_length / (2 * ETHER_ADDR_LEN);
if (list_count > MAX_BNEP_MULTICAST_FILTER) {
log_info("BNEP_MULTI_ADDR_SET: Too many filter");
response_code = BNEP_RESP_FILTER_ERR_TOO_MANY_FILTERS;
} else {
unsigned int i;
channel->multicast_filter_count = 0;
/* There is enough space, copy the filters to our filter list */
for (i = 0; i < (list_length / (2 * ETHER_ADDR_LEN)); i ++) {
for (i = 0; i < list_count; i ++) {
bd_addr_copy(channel->multicast_filter[channel->multicast_filter_count].addr_start, packet + 1 + 2 + (i * ETHER_ADDR_LEN * 2));
bd_addr_copy(channel->multicast_filter[channel->multicast_filter_count].addr_end, packet + 1 + 2 + (i * ETHER_ADDR_LEN * 2) + ETHER_ADDR_LEN);

26
src/classic/btstack_link_key_db_static.c
View File

@ -80,25 +80,13 @@ static char *link_key_to_str(link_key_t link_key){
}
static int sscanf_link_key(const char * link_key_string, link_key_t link_key){
unsigned int buffer[LINK_KEY_LEN];
// reset result buffer
memset(&buffer, 0, sizeof(buffer));
// parse
int result = sscanf( (char *) link_key_string, "%2x%2x%2x%2x%2x%2x%2x%2x%2x%2x%2x%2x%2x%2x%2x%2x",
&buffer[0], &buffer[1], &buffer[2], &buffer[3],
&buffer[4], &buffer[5], &buffer[6], &buffer[7],
&buffer[8], &buffer[9], &buffer[10], &buffer[11],
&buffer[12], &buffer[13], &buffer[14], &buffer[15] );
if (result != LINK_KEY_LEN) return 0;
// store
int i;
uint8_t *p = (uint8_t *) link_key;
for (i=0; i<LINK_KEY_LEN; i++ ) {
*p++ = (uint8_t) buffer[i];
uint16_t pos;
for (pos = 0 ; pos < LINK_KEY_LEN; pos++){
int high = nibble_for_char(*link_key_string++);
if (high < 0) return 0;
int low = nibble_for_char(*link_key_string++);
if (low < 0) return 0;
link_key[pos] = (((uint8_t) high) << 4) | ((uint8_t) low);
}
return 1;
}

4
src/classic/btstack_link_key_db_tlv.c
View File

@ -184,7 +184,7 @@ static int btstack_link_key_db_tlv_iterator_init(btstack_link_key_iterator_t * i
}
static int btstack_link_key_db_tlv_iterator_get_next(btstack_link_key_iterator_t * it, bd_addr_t bd_addr, link_key_t link_key, link_key_type_t * link_key_type){
uintptr_t i = (uintptr_t) it->context;
uint8_t i = (uint8_t)(uintptr_t) it->context;
int found = 0;
while (i<NVM_NUM_LINK_KEYS){
link_key_nvm_t entry;
@ -197,7 +197,7 @@ static int btstack_link_key_db_tlv_iterator_get_next(btstack_link_key_iterator_
found = 1;
break;
}
it->context = (void*) i;
it->context = (void*)(uintptr_t) i;
return found;
}

4
src/classic/hid_device.c
View File

@ -76,7 +76,7 @@ typedef struct hid_device {
uint8_t connected;
hid_device_state_t state;
hid_report_type_t report_type;
uint16_t report_id;
uint8_t report_id;
uint16_t expected_report_size;
uint16_t report_size;
uint8_t user_request_can_send_now;
@ -228,7 +228,7 @@ void hid_create_sdp_record(uint8_t *service, uint32_t service_record_handle, con
// 0x0100 "ServiceName"
de_add_number(service, DE_UINT, DE_SIZE_16, 0x0100);
de_add_data(service, DE_STRING, strlen(params->device_name), (uint8_t *) params->device_name);
de_add_data(service, DE_STRING, (uint16_t) strlen(params->device_name), (uint8_t *) params->device_name);
de_add_number(service, DE_UINT, DE_SIZE_16, BLUETOOTH_ATTRIBUTE_BLUETOOTH_PROFILE_DESCRIPTOR_LIST);
attribute = de_push_sequence(service);

4
src/classic/obex_message_builder.c
View File

@ -220,14 +220,14 @@ uint8_t obex_message_builder_header_add_name_prefix(uint8_t * buffer, uint16_t b
return ERROR_CODE_SUCCESS;
}
uint8_t obex_message_builder_header_add_name(uint8_t * buffer, uint16_t buffer_len, const char * name){
uint16_t name_len = strlen(name);
uint16_t name_len = (uint16_t) strlen(name);
return obex_message_builder_header_add_name_prefix(buffer, buffer_len, name, name_len);
}
uint8_t obex_message_builder_header_add_type(uint8_t * buffer, uint16_t buffer_len, const char * type){
uint8_t header[3];
header[0] = OBEX_HEADER_TYPE;
int len_incl_zero = strlen(type) + 1;
int len_incl_zero = (uint16_t) strlen(type) + 1;
big_endian_store_16(header, 1, 1 + 2 + len_incl_zero);
uint8_t status = obex_message_builder_packet_append(buffer, buffer_len, &header[0], sizeof(header));

3
src/classic/obex_parser.c
View File

@ -282,7 +282,8 @@ obex_app_param_parser_params_state_t obex_app_param_parser_process_data(obex_app
break;
case OBEX_APP_PARAM_PARSER_STATE_W4_VALUE:
bytes_to_consume = btstack_min(parser->tag_len - parser->tag_pos, data_len);
(*parser->callback)(parser->user_data, parser->tag_id, parser->tag_len, parser->tag_pos, data_buffer, bytes_to_consume);
// param_size is uint8_t
(*parser->callback)(parser->user_data, parser->tag_id, (uint8_t) parser->tag_len, (uint8_t) parser->tag_pos, data_buffer, (uint8_t) bytes_to_consume);
parser->tag_pos += bytes_to_consume;
if (parser->tag_pos == parser->tag_len){
parser->state = OBEX_APP_PARAM_PARSER_STATE_W4_TYPE;

20
src/classic/pan.c
View File

@ -152,17 +152,17 @@ static void pan_create_service(uint8_t *service, uint32_t service_record_handle,
// 0x0100 "Service Name"
de_add_number(service, DE_UINT, DE_SIZE_16, 0x0100);
if (name){
de_add_data(service, DE_STRING, strlen(name), (uint8_t *) name);
de_add_data(service, DE_STRING, (uint16_t) strlen(name), (uint8_t *) name);
} else {
switch (service_uuid){
case BLUETOOTH_SERVICE_CLASS_PANU:
de_add_data(service, DE_STRING, strlen(pan_default_panu_service_name), (uint8_t *) pan_default_panu_service_name);
de_add_data(service, DE_STRING, (uint16_t) strlen(pan_default_panu_service_name), (uint8_t *) pan_default_panu_service_name);
break;
case BLUETOOTH_SERVICE_CLASS_NAP:
de_add_data(service, DE_STRING, strlen(pan_default_nap_service_name), (uint8_t *) pan_default_nap_service_name);
de_add_data(service, DE_STRING, (uint16_t) strlen(pan_default_nap_service_name), (uint8_t *) pan_default_nap_service_name);
break;
case BLUETOOTH_SERVICE_CLASS_GN:
de_add_data(service, DE_STRING, strlen(pan_default_gn_service_name), (uint8_t *) pan_default_gn_service_name);
de_add_data(service, DE_STRING, (uint16_t) strlen(pan_default_gn_service_name), (uint8_t *) pan_default_gn_service_name);
break;
default:
break;
@ -172,17 +172,17 @@ static void pan_create_service(uint8_t *service, uint32_t service_record_handle,
// 0x0101 "Service Description"
de_add_number(service, DE_UINT, DE_SIZE_16, 0x0101);
if (descriptor){
de_add_data(service, DE_STRING, strlen(descriptor), (uint8_t *) descriptor);
de_add_data(service, DE_STRING, (uint16_t) strlen(descriptor), (uint8_t *) descriptor);
} else {
switch (service_uuid){
case BLUETOOTH_SERVICE_CLASS_PANU:
de_add_data(service, DE_STRING, strlen(pan_default_panu_service_desc), (uint8_t *) pan_default_panu_service_desc);
de_add_data(service, DE_STRING, (uint16_t) strlen(pan_default_panu_service_desc), (uint8_t *) pan_default_panu_service_desc);
break;
case BLUETOOTH_SERVICE_CLASS_NAP:
de_add_data(service, DE_STRING, strlen(pan_default_nap_service_desc), (uint8_t *) pan_default_nap_service_desc);
de_add_data(service, DE_STRING, (uint16_t) strlen(pan_default_nap_service_desc), (uint8_t *) pan_default_nap_service_desc);
break;
case BLUETOOTH_SERVICE_CLASS_GN:
de_add_data(service, DE_STRING, strlen(pan_default_gn_service_desc), (uint8_t *) pan_default_gn_service_desc);
de_add_data(service, DE_STRING, (uint16_t) strlen(pan_default_gn_service_desc), (uint8_t *) pan_default_gn_service_desc);
break;
default:
break;
@ -198,13 +198,13 @@ static void pan_create_service(uint8_t *service, uint32_t service_record_handle,
if (IPv4Subnet){
// 0x030D "IPv4Subnet", optional
de_add_number(service, DE_UINT, DE_SIZE_16, 0x030D);
de_add_data(service, DE_STRING, strlen(IPv4Subnet), (uint8_t *) IPv4Subnet);
de_add_data(service, DE_STRING, (uint16_t) strlen(IPv4Subnet), (uint8_t *) IPv4Subnet);
}
if (IPv6Subnet){
// 0x030E "IPv6Subnet", optional
de_add_number(service, DE_UINT, DE_SIZE_16, 0x030E);
de_add_data(service, DE_STRING, strlen(IPv6Subnet), (uint8_t *) IPv6Subnet);
de_add_data(service, DE_STRING, (uint16_t) strlen(IPv6Subnet), (uint8_t *) IPv6Subnet);
}
if (service_uuid == BLUETOOTH_SERVICE_CLASS_GN) return;

15
src/classic/pbap_client.c
View File

@ -292,11 +292,11 @@ static void pbap_client_emit_card_result_event(pbap_client_t * context, const ch
event[pos++] = PBAP_SUBEVENT_CARD_RESULT;
little_endian_store_16(event,pos,context->cid);
pos+=2;
int name_len = btstack_min(PBAP_MAX_NAME_LEN, strlen(name));
int name_len = btstack_min(PBAP_MAX_NAME_LEN, (uint16_t) strlen(name));
event[pos++] = name_len;
(void)memcpy(&event[pos], name, name_len);
pos += name_len;
int handle_len = btstack_min(PBAP_MAX_HANDLE_LEN, strlen(handle));
int handle_len = btstack_min(PBAP_MAX_HANDLE_LEN, (uint16_t) strlen(handle));
event[pos++] = handle_len;
(void)memcpy(&event[pos], handle, handle_len);
pos += handle_len;
@ -442,9 +442,9 @@ static void obex_srm_init(obex_srm_t * obex_srm){
}
static void pbap_client_yml_append_character(yxml_t * xml_parser, char * buffer, uint16_t buffer_size){
// "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."
uint16_t char_len = strlen(xml_parser->data);
uint16_t char_len = (uint16_t) strlen(xml_parser->data);
btstack_assert(char_len <= 4);
uint16_t dest_len = strlen(buffer);
uint16_t dest_len = (uint16_t) strlen(buffer);
uint16_t zero_pos = dest_len + char_len;
if (zero_pos >= buffer_size) return;
memcpy(&buffer[dest_len], xml_parser->data, char_len);
@ -601,9 +601,10 @@ static uint16_t pbap_client_application_params_add_phone_number(const pbap_clien
uint16_t pos = 0;
if (client->phone_number){
// Search by phone number
uint16_t phone_number_len = btstack_min(PBAP_MAX_PHONE_NUMBER_LEN, strlen(client->phone_number));
uint16_t phone_number_len = btstack_min(PBAP_MAX_PHONE_NUMBER_LEN, (uint16_t) strlen(client->phone_number));
application_parameters[pos++] = PBAP_APPLICATION_PARAMETER_SEARCH_VALUE;
application_parameters[pos++] = phone_number_len;
btstack_assert(phone_number_len <= 255);
application_parameters[pos++] = (uint8_t) phone_number_len;
(void)memcpy(&application_parameters[pos],
pbap_client->phone_number, phone_number_len);
pos += phone_number_len;
@ -721,7 +722,7 @@ static void pbap_handle_can_send_now(void){
MD5_Init(&md5_ctx);
MD5_Update(&md5_ctx, pbap_client->obex_auth_parser.authentication_nonce, 16);
MD5_Update(&md5_ctx, &collon, 1);
MD5_Update(&md5_ctx, pbap_client->authentication_password, strlen(pbap_client->authentication_password));
MD5_Update(&md5_ctx, pbap_client->authentication_password, (uint16_t) strlen(pbap_client->authentication_password));
MD5_Final(&challenge_response[pos], &md5_ctx);
pos += 16;
challenge_response[pos++] = 2; // Tag Nonce

2
src/classic/spp_server.c
View File

@ -126,7 +126,7 @@ static void spp_create_sdp_record_internal(uint8_t *service, uint32_t service_re
// 0x0100 "ServiceName"
de_add_number(service, DE_UINT, DE_SIZE_16, 0x0100);
de_add_data(service, DE_STRING, strlen(name), (uint8_t *) name);
de_add_data(service, DE_STRING, (uint16_t) strlen(name), (uint8_t *) name);
}
void spp_create_sdp_record(uint8_t *service, uint32_t service_record_handle, int rfcomm_channel, const char *name){