* remove AVAHI_PUBLISH_IS_PROXY, it was a bad idea

[catta] / avahi-common / malloc.h

diff --git a/avahi-common/malloc.h b/avahi-common/malloc.h
index 11ac9cfb3478a52d6a478b25cb998a1f72287f6c..d0e620a3fd2e4102ec98aeac8c6c3efa5582ffcb 100644 (file)
--- a/avahi-common/malloc.h
+++ b/avahi-common/malloc.h
@@ -22,9 +22,16 @@
   USA.
 ***/
 
+/** \file malloc.h Memory allocation */
+
 #include <sys/types.h>
 #include <stdarg.h>
 
+#include <avahi-common/cdecl.h>
+#include <avahi-common/gccmacro.h>
+
+AVAHI_C_DECL_BEGIN
+
 /** Allocate some memory, just like the libc malloc() */
 void *avahi_malloc(size_t size);
 
@@ -38,19 +45,24 @@ 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() */
+/** 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); 
+/** Just like libc's strndup() */
+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;
+
+/** Wraps allocator functions */
 struct AvahiAllocator {
     void* (*malloc)(size_t size);     
     void (*free)(void *p);           
@@ -58,18 +70,16 @@ struct AvahiAllocator {
     void* (*calloc)(size_t nmemb, size_t size);   /**< May be NULL */
 };
 
-/* Change the allocator. May be NULL to return to default (libc)
+/** Change the allocator. May be NULL to return to default (libc)
  * allocators. The structure is not copied! */
 void avahi_set_allocator(const AvahiAllocator *a);
 
+/** Like sprintf() but store the result in a freshly allocated buffer. Free this with avahi_free() */
+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);
 
-#ifdef __GNUC__
-char *avahi_strdup_printf(const char *fmt, ... )  __attribute__ ((format(printf, 1, 2)));
-#else
-char *avahi_strdup_printf(const char *fmt, ... );
-#endif
-
+AVAHI_C_DECL_END
 
 #endif