* remove lots of DOXYGEN_SHOULD_SKIP_THIS from the header files, use doxygen macro...

[catta] / avahi-common / malloc.h

diff --git a/avahi-common/malloc.h b/avahi-common/malloc.h
index 2dd740e10e2525528b2bb864ef4c7f8ec2b716b9..d911a3a35d64306cd39edeb97cc2fa2c7b988d7b 100644 (file)
--- 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,38 +45,34 @@ 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);
 
-/** Wraps allocator functions */
-typedef struct AvahiAllocator AvahiAllocator;
+/** 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 */
-struct AvahiAllocator {
+typedef struct AvahiAllocator {
     void* (*malloc)(size_t size);     
     void (*free)(void *p);           
     void* (*realloc)(void *p, size_t size);
     void* (*calloc)(size_t nmemb, size_t size);   /**< May be NULL */
-};
+} AvahiAllocator;
 
 /** Change the allocator. May be NULL to return to default (libc)
  * 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);