Skip to content

Commit 4a491b9

Browse files
author
Antti Yli-Tokola
committed
Update mbed-coap to version 5.1.2
Compiler warning cleanups.
1 parent 9dc0c37 commit 4a491b9

File tree

3 files changed

+9
-29
lines changed

3 files changed

+9
-29
lines changed

features/frameworks/mbed-coap/CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# Change Log
22

3+
## [v5.1.2](https://github.com/ARMmbed/mbed-coap/releases/tag/v5.1.2)
4+
5+
- Compiler warning cleanups.
6+
7+
-[Full Changelog](https://github.com/ARMmbed/mbed-coap/compare/v5.1.1...v5.1.2)
8+
9+
310
## [v5.1.1](https://github.com/ARMmbed/mbed-coap/releases/tag/v5.1.1)
411

512
- Delay the random initialization of message id to a later phase and not during init() so there is enough time

features/frameworks/mbed-coap/doxygen/libcoap_doxy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -675,7 +675,7 @@ WARN_LOGFILE =
675675
# directories like "/usr/src/myproject". Separate the files or directories
676676
# with spaces.
677677

678-
INPUT = ../nsdl-c
678+
INPUT = ../mbed-coap
679679

680680
# This tag can be used to specify the character encoding of the source files
681681
# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is

features/frameworks/mbed-coap/source/sn_coap_protocol.c

Lines changed: 1 addition & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ static uint8_t *sn_coap_protocol_linked_list_blockwise_payload_
6262
static coap_blockwise_payload_s *sn_coap_protocol_linked_list_blockwise_search(struct coap_s *handle, const sn_nsdl_addr_s *src_addr_ptr, const uint8_t *token_ptr, uint8_t token_len);
6363
static bool sn_coap_protocol_linked_list_blockwise_payload_search_compare_block_number(struct coap_s *handle, const sn_nsdl_addr_s *src_addr_ptr, const uint8_t *token_ptr, uint8_t token_len, uint32_t block_number);
6464
static void sn_coap_protocol_linked_list_blockwise_payload_remove(struct coap_s *handle, coap_blockwise_payload_s *removed_payload_ptr);
65-
static void sn_coap_protocol_linked_list_blockwise_payload_remove_oldest(struct coap_s *handle, uint8_t *token_ptr, uint8_t token_len);
6665
static uint32_t sn_coap_protocol_linked_list_blockwise_payloads_get_len(struct coap_s *handle, const sn_nsdl_addr_s *src_addr_ptr, const uint8_t *token_ptr, uint8_t token_len);
6766
static void sn_coap_protocol_handle_blockwise_timout(struct coap_s *handle);
6867
static sn_coap_hdr_s *sn_coap_handle_blockwise_message(struct coap_s *handle, sn_nsdl_addr_s *src_addr_ptr, sn_coap_hdr_s *received_coap_msg_ptr, void *param);
@@ -1465,32 +1464,6 @@ static bool sn_coap_protocol_linked_list_blockwise_payload_search_compare_block_
14651464
return false;
14661465
}
14671466

1468-
/**************************************************************************//**
1469-
* \fn static void sn_coap_protocol_linked_list_blockwise_payload_remove_oldest(struct coap_s *handle)
1470-
*
1471-
* \brief Removes current stored blockwise paylod from Linked list
1472-
*****************************************************************************/
1473-
1474-
static void sn_coap_protocol_linked_list_blockwise_payload_remove_oldest(struct coap_s *handle, uint8_t *token_ptr, uint8_t token_len)
1475-
{
1476-
/* Remove oldest node in Linked list*/
1477-
if (token_ptr) {
1478-
ns_list_foreach(coap_blockwise_payload_s, removed_payload_ptr, &handle->linked_list_blockwise_received_payloads) {
1479-
if ((token_len == removed_payload_ptr->token_len) && !memcmp(removed_payload_ptr->token_ptr, token_ptr, token_len)) {
1480-
sn_coap_protocol_linked_list_blockwise_payload_remove(handle, removed_payload_ptr);
1481-
return;
1482-
}
1483-
}
1484-
} else {
1485-
ns_list_foreach(coap_blockwise_payload_s, removed_payload_ptr, &handle->linked_list_blockwise_received_payloads) {
1486-
if (!removed_payload_ptr->token_ptr) {
1487-
sn_coap_protocol_linked_list_blockwise_payload_remove(handle, removed_payload_ptr);
1488-
return;
1489-
}
1490-
}
1491-
}
1492-
}
1493-
14941467
/**************************************************************************//**
14951468
* \fn static void sn_coap_protocol_linked_list_blockwise_payload_remove(struct coap_s *handle,
14961469
* coap_blockwise_msg_s *removed_msg_ptr)
@@ -2286,7 +2259,7 @@ static bool sn_coap_handle_last_blockwise(struct coap_s *handle, const sn_nsdl_a
22862259
uint32_t whole_payload_len = sn_coap_protocol_linked_list_blockwise_payloads_get_len(handle, src_addr_ptr, received_coap_msg_ptr->token_ptr, received_coap_msg_ptr->token_len);
22872260
uint8_t *payload_ptr = sn_coap_protocol_linked_list_blockwise_payload_search(handle, src_addr_ptr, &payload_len, received_coap_msg_ptr->token_ptr, received_coap_msg_ptr->token_len);
22882261

2289-
tr_debug("sn_coap_handle_last_blockwise - whole len %d", whole_payload_len);
2262+
tr_debug("sn_coap_handle_last_blockwise - whole len %" PRIu32, whole_payload_len);
22902263
if (!whole_payload_len) {
22912264
return false;
22922265
}

0 commit comments

Comments
 (0)