diff options
| author | Simon McVittie <smcv@debian.org> | 2011-01-31 17:38:10 +0000 |
|---|---|---|
| committer | Simon McVittie <smcv@debian.org> | 2011-01-31 17:38:10 +0000 |
| commit | 7e5f91a2e50af075be865533eb6ebdfe6bc5b4ad (patch) | |
| tree | 9d5bd881971b467f4452fa7ca2f1b12db9d68197 /bus/config-loader-expat.c | |
| parent | 24fbe571516161d48b499d587f9adb3e683dbf88 (diff) | |
| download | dbus-7e5f91a2e50af075be865533eb6ebdfe6bc5b4ad.tar.gz | |
Imported Upstream version 1.4.1upstream/1.4.1
Diffstat (limited to 'bus/config-loader-expat.c')
| -rw-r--r-- | bus/config-loader-expat.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/bus/config-loader-expat.c b/bus/config-loader-expat.c index c0620aed..b571fda3 100644 --- a/bus/config-loader-expat.c +++ b/bus/config-loader-expat.c @@ -21,16 +21,12 @@ * */ +#include <config.h> #include "config-parser.h" #include <dbus/dbus-internals.h> #include <expat.h> -static XML_Memory_Handling_Suite memsuite = -{ - dbus_malloc, - dbus_realloc, - dbus_free -}; +static XML_Memory_Handling_Suite memsuite; typedef struct { @@ -195,7 +191,11 @@ bus_config_load (const DBusString *file, _dbus_string_free (&context.content); return NULL; } - + + memsuite.malloc_fcn = dbus_malloc; + memsuite.realloc_fcn = dbus_realloc; + memsuite.free_fcn = dbus_free; + expat = XML_ParserCreate_MM ("UTF-8", &memsuite, NULL); if (expat == NULL) { |