diff options
author | Lennart Poettering <lennart@poettering.net> | 2005-08-13 21:25:09 +0000 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2005-08-13 21:25:09 +0000 |
commit | 4f0a5e7572a4257894b4bfede42c26d65152609e (patch) | |
tree | 21e3d5ee20716739590e5931859a4c2052161395 /avahi-glib/glib-malloc.c | |
parent | d6d7d3769441b73ffb5b7af34fef823b41e66312 (diff) |
* strip glib from avahi-core
* implement glib memory allocator
* add new documentation file MALLOC
* initialize pseudo-RNG from /dev/urandom in avahi-daemon
* remove some gcc 4.0 warnings
* beef up watch system with real timeouts
* move GCC __attribute__ macros into its own header avahi-common/gccmacro.h
* make use of GCC's sentinel attribute where it make sense
* add malloc() implementations that abort on OOM and enable them by default
git-svn-id: file:///home/lennart/svn/public/avahi/trunk@308 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe
Diffstat (limited to 'avahi-glib/glib-malloc.c')
-rw-r--r-- | avahi-glib/glib-malloc.c | 57 |
1 files changed, 57 insertions, 0 deletions
diff --git a/avahi-glib/glib-malloc.c b/avahi-glib/glib-malloc.c new file mode 100644 index 0000000..2968abc --- /dev/null +++ b/avahi-glib/glib-malloc.c @@ -0,0 +1,57 @@ +/* $Id$ */ + +/*** + This file is part of avahi. + + avahi is free software; you can redistribute it and/or modify it + under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of the + License, or (at your option) any later version. + + avahi is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General + Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with avahi; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + USA. +***/ + +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + +#include <avahi-common/llist.h> +#include <avahi-common/malloc.h> + +#include "glib-malloc.h" + +static void* malloc_glue(size_t l) { + return g_malloc(l); +} + +static void* realloc_glue(void *p, size_t l) { + return g_realloc(p, l); +} + +static void* calloc_glue(size_t nmemb, size_t size) { + return g_malloc0(nmemb * size); +} + +const AvahiAllocator *avahi_glib_allocator(void) { + + static AvahiAllocator allocator; + static int allocator_initialized = 0; + + if (!allocator_initialized) { + allocator.malloc = malloc_glue; + allocator.free = g_free; + allocator.realloc = realloc_glue; + allocator.calloc = calloc_glue; + allocator_initialized = 1; + } + + return &allocator; +} |