--- embedaddon/mpd/src/mbuf.h 2012/02/21 23:32:47 1.1.1.1 +++ embedaddon/mpd/src/mbuf.h 2019/10/22 13:49:55 1.1.1.4 @@ -29,7 +29,7 @@ /* Macros */ #define MBDATAU(bp) ((u_char *)(bp) + sizeof(struct mpdmbuf) + (bp)->offset) #define MBDATA(bp) ((bp) ? MBDATAU(bp) : NULL) - #define MBLEN(bp) ((bp) ? (bp)->cnt : 0) + #define MBLEN(bp) ((size_t)((bp) ? (bp)->cnt : 0)) #define MBSPACE(bp) ((bp) ? (bp)->size - (bp)->offset : 0) /* Types of allocated memory */ @@ -55,6 +55,8 @@ #define MB_PPTP "PPTP" #define MB_RADIUS "RADIUS" #define MB_RADSRV "RADSRV" + #define MB_ACL "ACL_BPF" + #define MB_IPFW "ACL_IPFW" #define MB_UTIL "UTIL" #define MB_VJCOMP "VJCOMP" #define MB_IPPOOL "IPPOOL" @@ -71,6 +73,7 @@ extern void *Malloc(const char *type, size_t size) __malloc_like; extern void *Mdup(const char *type, const void *src, size_t size) __malloc_like; + extern void *Mdup2(const char *type, const void *src, size_t oldsize, size_t newsize) __malloc_like; extern void *Mstrdup(const char *type, const void *src) __malloc_like; extern void Freee(void *ptr);