You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by ma...@apache.org on 2016/11/30 16:57:56 UTC
[08/16] incubator-mynewt-core git commit: oic coap;
don't use void * where coap_packet_t * should be used.
oic coap; don't use void * where coap_packet_t * should be used.
Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/670a6577
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/670a6577
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/670a6577
Branch: refs/heads/develop
Commit: 670a657709a2ab6b45787c7721f6bf3e56e93884
Parents: d2321da
Author: Marko Kiiskila <ma...@runtime.io>
Authored: Mon Nov 28 16:24:40 2016 -0800
Committer: Marko Kiiskila <ma...@runtime.io>
Committed: Wed Nov 30 08:45:23 2016 -0800
----------------------------------------------------------------------
net/oic/src/messaging/coap/separate.c | 7 +++----
net/oic/src/messaging/coap/separate.h | 9 +++++----
2 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/670a6577/net/oic/src/messaging/coap/separate.c
----------------------------------------------------------------------
diff --git a/net/oic/src/messaging/coap/separate.c b/net/oic/src/messaging/coap/separate.c
index 2aad061..b542586 100644
--- a/net/oic/src/messaging/coap/separate.c
+++ b/net/oic/src/messaging/coap/separate.c
@@ -64,15 +64,14 @@ static uint8_t coap_separate_area[OS_MEMPOOL_BYTES(MAX_NUM_CONCURRENT_REQUESTS,
* then retry later.
*/
int
-coap_separate_accept(void *request, oc_separate_response_t *separate_response,
+coap_separate_accept(coap_packet_t *coap_req,
+ oc_separate_response_t *separate_response,
oc_endpoint_t *endpoint, int observe)
{
if (separate_response->active == 0) {
OC_LIST_STRUCT_INIT(separate_response, requests);
}
- coap_packet_t *const coap_req = (coap_packet_t *)request;
-
for (coap_separate_t *item = oc_list_head(separate_response->requests);
item != NULL; item = oc_list_item_next(separate_response->requests)) {
if (item->token_len == coap_req->token_len &&
@@ -133,7 +132,7 @@ coap_separate_accept(void *request, oc_separate_response_t *separate_response,
}
/*----------------------------------------------------------------------------*/
void
-coap_separate_resume(void *response, coap_separate_t *separate_store,
+coap_separate_resume(coap_packet_t *response, coap_separate_t *separate_store,
uint8_t code, uint16_t mid)
{
coap_init_message(response, separate_store->type, code, mid);
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/670a6577/net/oic/src/messaging/coap/separate.h
----------------------------------------------------------------------
diff --git a/net/oic/src/messaging/coap/separate.h b/net/oic/src/messaging/coap/separate.h
index 9b3379e..c39d532 100644
--- a/net/oic/src/messaging/coap/separate.h
+++ b/net/oic/src/messaging/coap/separate.h
@@ -45,8 +45,7 @@ extern "C" {
#include "oc_coap.h"
#include "oic/oc_ri.h"
-typedef struct coap_separate
-{
+typedef struct coap_separate {
struct coap_separate *next;
coap_message_type_t type;
@@ -64,10 +63,12 @@ typedef struct coap_separate
oc_endpoint_t endpoint;
} coap_separate_t;
-int coap_separate_accept(void *request,
+typedef struct coap_packet coap_packet_t;
+int coap_separate_accept(coap_packet_t *request,
oc_separate_response_t *separate_response,
oc_endpoint_t *endpoint, int observe);
-void coap_separate_resume(void *response, coap_separate_t *separate_store,
+void coap_separate_resume(coap_packet_t *response,
+ coap_separate_t *separate_store,
uint8_t code, uint16_t mid);
void coap_separate_clear(oc_separate_response_t *separate_response,
coap_separate_t *separate_store);