+2004-07-31 Olivier Andrieu <oliv__a@users.sourceforge.net>
+
+ * bus/config-parser.c (bus_config_parser_new): fix an invalid
+ _unref in the SELinux support.
+
+ * doc/busconfig.dtd: update DTD for SELinux support.
+
+ * bus/config-loader-libxml.c: fix error handler and parser
+ initialisation/cleanup. OOM test now works with libxml2 HEAD.
+
+ * configure.in: remove the warning about libxml2.
+
+ * dbus/dbus-bus.c: silence doxygen warning.
+
2004-07-31 Colin Walters <walters@redhat.com>
* configure.in: Move #error in SELinux check to its own line.
xml_error->code, xml_error->message);
#endif
- if (!dbus_error_is_set (error) &&
- (xml_error->level == XML_ERR_ERROR ||
- xml_error->level == XML_ERR_FATAL))
+ if (!dbus_error_is_set (error))
{
- if (xml_error->code != XML_ERR_NO_MEMORY)
+ if (xml_error->code == XML_ERR_NO_MEMORY)
_DBUS_SET_OOM (error);
- else
+ else if (xml_error->level == XML_ERR_ERROR ||
+ xml_error->level == XML_ERR_FATAL)
dbus_set_error (error, DBUS_ERROR_FAILED,
"Error loading config file: '%s'",
xml_error->message);
xmlTextReader *reader;
BusConfigParser *parser;
DBusString dirname, data;
- const char *data_str;
DBusError tmp_error;
int ret;
parser = NULL;
reader = NULL;
- if (is_toplevel)
- {
- /* xmlMemSetup only fails if one of the functions is NULL */
- xmlMemSetup (dbus_free,
- dbus_malloc,
- dbus_realloc,
- _dbus_strdup);
- xmlInitParser ();
- xmlSetGenericErrorFunc (NULL, xml_shut_up);
- }
-
if (!_dbus_string_init (&dirname))
{
_DBUS_SET_OOM (error);
return NULL;
}
+ if (is_toplevel)
+ {
+ /* xmlMemSetup only fails if one of the functions is NULL */
+ xmlMemSetup (dbus_free,
+ dbus_malloc,
+ dbus_realloc,
+ _dbus_strdup);
+ xmlInitParser ();
+ xmlSetGenericErrorFunc (NULL, xml_shut_up);
+ }
+
if (!_dbus_string_get_dirname (file, &dirname))
{
_DBUS_SET_OOM (error);
if (!_dbus_file_get_contents (&data, file, error))
goto failed;
- data_str = _dbus_string_get_const_data (&data);
-
- reader = xmlReaderForMemory (data_str, _dbus_string_get_length (&data),
+ reader = xmlReaderForMemory (_dbus_string_get_const_data (&data),
+ _dbus_string_get_length (&data),
NULL, NULL, 0);
if (reader == NULL)
{
reader_out:
xmlFreeTextReader (reader);
- if (is_toplevel)
- xmlCleanupParser();
reader = NULL;
if (dbus_error_is_set (&tmp_error))
{
goto failed;
_dbus_string_free (&dirname);
_dbus_string_free (&data);
+ if (is_toplevel)
+ xmlCleanupParser();
_DBUS_ASSERT_ERROR_IS_CLEAR (error);
return parser;
_DBUS_ASSERT_ERROR_IS_SET (error);
_dbus_string_free (&dirname);
_dbus_string_free (&data);
+ if (is_toplevel)
+ xmlCleanupParser();
if (parser)
bus_config_parser_unref (parser);
_dbus_assert (reader == NULL); /* must go to reader_out first */