diff options
| author | Havoc Pennington <hp@redhat.com> | 2003-03-28 05:42:19 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@redhat.com> | 2003-03-28 05:42:19 +0000 |
| commit | bf99381351b802fb3348a24037898222aae631e2 (patch) | |
| tree | aae0a9583e4d6aa559849e4326a3c9b2a7175015 /bus/config-loader-expat.c | |
| parent | 574c258bc9304d51bf0cdd131a6473e6fc5b477f (diff) | |
2003-03-28 Havoc Pennington <hp@pobox.com>
* bus/test.c (bus_test_flush_bus): remove the sleep from here,
I think it may have just been superstition. Not sure.
* dbus/dbus-string.c (_dbus_string_base64_decode): catch some OOM
failures that were not being handled.
* dbus/dbus-auth.c (process_auth): fix a memleak in OOM handling
* dbus/dbus-memory.c: add ability to set number of mallocs in a
row that will fail on out-of-memory.
* dbus/dbus-internals.c (_dbus_test_oom_handling): convenience
function for testing out-of-memory handling.
* bus/config-loader-expat.c (memsuite): don't wrap the dbus
allocation functions, they do map exactly to the expat ones.
Diffstat (limited to 'bus/config-loader-expat.c')
| -rw-r--r-- | bus/config-loader-expat.c | 24 |
1 files changed, 3 insertions, 21 deletions
diff --git a/bus/config-loader-expat.c b/bus/config-loader-expat.c index 5e8d28c1..c7981bf4 100644 --- a/bus/config-loader-expat.c +++ b/bus/config-loader-expat.c @@ -25,29 +25,11 @@ #include <dbus/dbus-internals.h> #include <expat.h> -static void* -expat_malloc (size_t size) -{ - return dbus_malloc (size); -} - -static void* -expat_realloc (void *ptr, size_t size) -{ - return dbus_realloc (ptr, size); -} - -static void -expat_free (void *ptr) -{ - dbus_free (ptr); -} - static XML_Memory_Handling_Suite memsuite = { - expat_malloc, - expat_realloc, - expat_free + dbus_malloc, + dbus_realloc, + dbus_free }; typedef struct |