diff options
author | Lennart Poettering <lennart@poettering.net> | 2005-08-12 00:54:24 +0000 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2005-08-12 00:54:24 +0000 |
commit | 33f474169daae72b9aa4c5ede260663207b2e4a3 (patch) | |
tree | 09eab09fd77e71ae445e6bc8caf1b9a66660bf03 /avahi-common/malloc.h | |
parent | 66c6bca0849a82be92d6bff82c478d769f8af869 (diff) |
Documentation updates
git-svn-id: file:///home/lennart/svn/public/avahi/trunk@301 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe
Diffstat (limited to 'avahi-common/malloc.h')
-rw-r--r-- | avahi-common/malloc.h | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/avahi-common/malloc.h b/avahi-common/malloc.h index 11ac9cf..2dd740e 100644 --- a/avahi-common/malloc.h +++ b/avahi-common/malloc.h @@ -22,9 +22,15 @@ USA. ***/ +/** \file malloc.h Memory allocation */ + #include <sys/types.h> #include <stdarg.h> +#include <avahi-common/cdecl.h> + +AVAHI_C_DECL_BEGIN + /** Allocate some memory, just like the libc malloc() */ void *avahi_malloc(size_t size); @@ -43,14 +49,16 @@ void *avahi_realloc(void *p, size_t size); /** Same as avahi_new() but set the memory to zero */ #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() */ +/** Just like libc's strndup() */ char *avahi_strndup(const char *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 +66,20 @@ 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); - -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 +/** Like sprintf() but store the result in a freshly allocated buffer. Free this with avahi_free() */ char *avahi_strdup_printf(const char *fmt, ... ); #endif +/** Same as avahi_strdup_printf() but take a va_list instead of varargs */ +char *avahi_strdup_vprintf(const char *fmt, va_list ap); + +AVAHI_C_DECL_END #endif |