RIOT: fix memarray use This change fixes the invocation of the MEMARRAY macro and memarray_init() to conform with the proposed API in [1]. [1] https://github.com/RIOT-OS/RIOT/pull/7651/ Change-Id: Iaede8ac17dfef758e54cd4072d58212c64ca4b08
diff --git a/crypto.c b/crypto.c index 7718b52..dcb7752 100644 --- a/crypto.c +++ b/crypto.c
@@ -120,12 +120,12 @@ #elif defined (RIOT_VERSION) #include "memarray.h" -MEMARRAY(handshake_storage, sizeof(dtls_handshake_parameters_t), DTLS_HANDSHAKE_MAX) -MEMARRAY(security_storage, sizeof(dtls_security_parameters_t), DTLS_SECURITY_MAX) +MEMARRAY(handshake_storage, dtls_handshake_parameters_t, DTLS_HANDSHAKE_MAX) +MEMARRAY(security_storage, dtls_security_parameters_t, DTLS_SECURITY_MAX) void crypto_init(void) { - memarray_init(&handshake_storage, sizeof(dtls_handshake_parameters_t), DTLS_HANDSHAKE_MAX); - memarray_init(&security_storage, sizeof(dtls_security_parameters_t), DTLS_SECURITY_MAX); + memarray_init(&handshake_storage); + memarray_init(&security_storage); } static dtls_handshake_parameters_t *dtls_handshake_malloc(void) {
diff --git a/dtls.c b/dtls.c index 422ddba..f640a0c 100644 --- a/dtls.c +++ b/dtls.c
@@ -63,7 +63,7 @@ #ifdef RIOT_VERSION #include "memarray.h" -MEMARRAY(dtlscontext_storage, sizeof(dtls_context_t), DTLS_CONTEXT_MAX) +MEMARRAY(dtlscontext_storage, dtls_context_t, DTLS_CONTEXT_MAX) #endif /* RIOT_VERSION */ #define dtls_set_version(H,V) dtls_int_to_uint16((H)->version, (V)) @@ -221,7 +221,7 @@ peer_init(); #ifdef RIOT_VERSION - memarray_init(&dtlscontext_storage, sizeof(dtls_context_t), DTLS_CONTEXT_MAX); + memarray_init(&dtlscontext_storage); #endif /* RIOT_VERSION */ }
diff --git a/netq.c b/netq.c index ca7a1a4..22ffc10 100644 --- a/netq.c +++ b/netq.c
@@ -64,7 +64,7 @@ #elif defined (RIOT_VERSION) #include "memarray.h" -MEMARRAY(netq_storage, sizeof(netq_t), NETQ_MAXCNT) +MEMARRAY(netq_storage, netq_t, NETQ_MAXCNT) static inline netq_t * netq_malloc_node(size_t size) { @@ -79,7 +79,7 @@ void netq_init(void) { - memarray_init(&netq_storage, sizeof(netq_t), NETQ_MAXCNT); + memarray_init(&netq_storage); } #endif /* WITH_CONTIKI */
diff --git a/peer.c b/peer.c index d410d45..c9a1be4 100644 --- a/peer.c +++ b/peer.c
@@ -62,11 +62,11 @@ #elif defined (RIOT_VERSION) #include "memarray.h" -MEMARRAY(peer_storage, sizeof(dtls_peer_t), DTLS_PEER_MAX) +MEMARRAY(peer_storage, dtls_peer_t, DTLS_PEER_MAX) void peer_init(void) { - memarray_init(&peer_storage, sizeof(dtls_peer_t), DTLS_PEER_MAX); + memarray_init(&peer_storage); } static inline dtls_peer_t *