projects
/
platform
/
upstream
/
dbus.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
DBusLoop: remove a layer of pointless abstraction around timeouts
[platform/upstream/dbus.git]
/
bus
/
config-loader-expat.c
diff --git
a/bus/config-loader-expat.c
b/bus/config-loader-expat.c
index
c0620ae
..
b571fda
100644
(file)
--- 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>
#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
{
typedef struct
{
@@
-195,7
+191,11
@@
bus_config_load (const DBusString *file,
_dbus_string_free (&context.content);
return NULL;
}
_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)
{
expat = XML_ParserCreate_MM ("UTF-8", &memsuite, NULL);
if (expat == NULL)
{