X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-common%2Fmalloc.h;h=d0e620a3fd2e4102ec98aeac8c6c3efa5582ffcb;hb=83c0bc0c4f8701e71d34896472810d0f5c73fbe5;hp=2dd740e10e2525528b2bb864ef4c7f8ec2b716b9;hpb=33f474169daae72b9aa4c5ede260663207b2e4a3;p=catta

diff --git a/avahi-common/malloc.h b/avahi-common/malloc.h
index 2dd740e..d0e620a 100644
--- a/avahi-common/malloc.h
+++ b/avahi-common/malloc.h
@@ -28,6 +28,7 @@
 #include <stdarg.h>
 
 #include <avahi-common/cdecl.h>
+#include <avahi-common/gccmacro.h>
 
 AVAHI_C_DECL_BEGIN
 
@@ -44,16 +45,19 @@ void avahi_free(void *p);
 void *avahi_realloc(void *p, size_t size);
 
 /** Allocate n new structures of the specified type. */
-#define avahi_new(type, n) (type*) avahi_malloc(n*sizeof(type))
+#define avahi_new(type, n) ((type*) avahi_malloc((n)*sizeof(type)))
 
 /** Same as avahi_new() but set the memory to zero */
-#define avahi_new0(type, n) (type*) avahi_malloc0(n*sizeof(type))
+#define avahi_new0(type, n) ((type*) avahi_malloc0((n)*sizeof(type)))
 
 /** Just like libc's strdup() */
 char *avahi_strdup(const char *s);
 
 /** Just like libc's strndup() */
-char *avahi_strndup(const char *s, size_t l); 
+char *avahi_strndup(const char *s, size_t l);
+
+/** Duplicate the given memory block into a new one allocated with avahi_malloc() */
+void *avahi_memdup(const void *s, size_t l);
 
 /** Wraps allocator functions */
 typedef struct AvahiAllocator AvahiAllocator;
@@ -70,12 +74,8 @@ struct AvahiAllocator {
  * allocators. The structure is not copied! */
 void avahi_set_allocator(const AvahiAllocator *a);
 
-#ifdef __GNUC__
-char *avahi_strdup_printf(const char *fmt, ... )  __attribute__ ((format(printf, 1, 2)));
-#else
 /** Like sprintf() but store the result in a freshly allocated buffer. Free this with avahi_free() */
-char *avahi_strdup_printf(const char *fmt, ... );
-#endif
+char *avahi_strdup_printf(const char *fmt, ... ) AVAHI_GCC_PRINTF_ATTR12;
 
 /** Same as avahi_strdup_printf() but take a va_list instead of varargs */
 char *avahi_strdup_vprintf(const char *fmt, va_list ap);