From 0af4a18c09d6759f8285e017c216b04b8c2414ac Mon Sep 17 00:00:00 2001 From: kkrentz Date: Wed, 3 Feb 2016 08:09:13 -0800 Subject: [PATCH] packetbuf: Use MIN macro --- core/net/packetbuf.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/net/packetbuf.c b/core/net/packetbuf.c index 1e6b9a57f..a2f295816 100644 --- a/core/net/packetbuf.c +++ b/core/net/packetbuf.c @@ -47,6 +47,7 @@ #include "contiki-net.h" #include "net/packetbuf.h" #include "net/rime/rime.h" +#include "sys/cc.h" struct packetbuf_attr packetbuf_attrs[PACKETBUF_NUM_ATTRS]; struct packetbuf_addr packetbuf_addrs[PACKETBUF_NUM_ADDRS]; @@ -89,7 +90,7 @@ packetbuf_copyfrom(const void *from, uint16_t len) uint16_t l; packetbuf_clear(); - l = len > PACKETBUF_SIZE? PACKETBUF_SIZE: len; + l = MIN(PACKETBUF_SIZE, len); memcpy(packetbufptr, from, l); buflen = l; return l;