riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #2560 from authmillenon/ng_netif_hdr/fix/static-inline

Browse Source 
ng_netif_hdr: make inline functions static
This commit is contained in:
Hauke Petersen 2015-03-10 14:23:32 +01:00
commit 3540ff9a26
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
sys/include/net/ng_netif/hdr.h
View File

@ -7,8 +7,8 @@
*/
/**
* @defgroup net_netif_hdr Generic network interface header
* @ingroup net_netif
* @defgroup net_ng_netif_hdr Generic network interface header
* @ingroup net_ng_netif
* @{
*
* @file
@ -50,8 +50,8 @@ typedef struct __attribute__((packed)) {
* @param[in] src_l2addr_len link layer source address length
* @param[in] dst_l2addr_len link layer destination address length
*/
inline void ng_netif_hdr_init(ng_netif_hdr_t *hdr, uint8_t src_l2addr_len,
uint8_t dst_l2addr_len)
static inline void ng_netif_hdr_init(ng_netif_hdr_t *hdr, uint8_t src_l2addr_len,
uint8_t dst_l2addr_len)
{
hdr->src_l2addr_len = src_l2addr_len;
hdr->dst_l2addr_len = dst_l2addr_len;
@ -68,7 +68,7 @@ inline void ng_netif_hdr_init(ng_netif_hdr_t *hdr, uint8_t src_l2addr_len,
* @return the size of the given header, including link layer
* addresses
*/
inline size_t ng_netif_hdr_sizeof(ng_netif_hdr_t *hdr)
static inline size_t ng_netif_hdr_sizeof(ng_netif_hdr_t *hdr)
{
return sizeof(ng_netif_hdr_t) + hdr->src_l2addr_len + hdr->dst_l2addr_len;
}
@ -81,9 +81,9 @@ inline size_t ng_netif_hdr_sizeof(ng_netif_hdr_t *hdr)
* @return pointer to source address on success
* @return NULL on error
*/
inline uint8_t *ng_netif_hdr_get_src_addr(ng_netif_hdr_t *hdr)
static inline uint8_t *ng_netif_hdr_get_src_addr(ng_netif_hdr_t *hdr)
{
return ((uint8_t *)hdr) + sizeof(ng_netif_hdr_t);
return ((uint8_t *)(hdr + 1));
}
/**
@ -93,13 +93,14 @@ inline uint8_t *ng_netif_hdr_get_src_addr(ng_netif_hdr_t *hdr)
* @param[in] addr new source address
* @param[in] addr_len *addr* length
*/
inline void ng_netif_hdr_set_src_addr(ng_netif_hdr_t *hdr, uint8_t *addr,
uint8_t addr_len)
static inline void ng_netif_hdr_set_src_addr(ng_netif_hdr_t *hdr, uint8_t *addr,
uint8_t addr_len)
{
if (addr_len != hdr->src_l2addr_len) {
return;
}
memcpy(((uint8_t *)hdr) + sizeof(ng_netif_hdr_t), addr, addr_len);
memcpy(((uint8_t *)(hdr + 1)), addr, addr_len);
}
@ -111,9 +112,9 @@ inline void ng_netif_hdr_set_src_addr(ng_netif_hdr_t *hdr, uint8_t *addr,
* @return pointer to destination address on success
* @return NULL on error
*/
inline uint8_t *ng_netif_hdr_get_dst_addr(ng_netif_hdr_t *hdr)
static inline uint8_t *ng_netif_hdr_get_dst_addr(ng_netif_hdr_t *hdr)
{
return ((uint8_t *)hdr) + sizeof(ng_netif_hdr_t) + hdr->src_l2addr_len;
return (((uint8_t *)(hdr + 1)) + hdr->src_l2addr_len);
}
/**
@ -123,14 +124,14 @@ inline uint8_t *ng_netif_hdr_get_dst_addr(ng_netif_hdr_t *hdr)
* @param[in] addr new destination address
* @param[in] addr_len *addr* length
*/
inline void ng_netif_hdr_set_dst_addr(ng_netif_hdr_t *hdr, uint8_t *addr,
uint8_t addr_len)
static inline void ng_netif_hdr_set_dst_addr(ng_netif_hdr_t *hdr, uint8_t *addr,
uint8_t addr_len)
{
if (addr_len != hdr->dst_l2addr_len) {
return;
}
memcpy(((uint8_t *)hdr) + sizeof(ng_netif_hdr_t) + hdr->dst_l2addr_len,
addr, addr_len);
memcpy(((uint8_t *)(hdr + 1)) + hdr->src_l2addr_len, addr, addr_len);
}
#ifdef __cplusplus