From 19b91e4e52e6f2fe8ee19238f16dfad47f6794c3 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Fri, 7 Oct 2016 19:19:35 +0100 Subject: [PATCH 05/13] Print XML parse errors correctly Signed-off-by: Simon McVittie --- bus/config-loader-expat.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/bus/config-loader-expat.c b/bus/config-loader-expat.c index 9019697..f59942e 100644 --- a/bus/config-loader-expat.c +++ b/bus/config-loader-expat.c @@ -254,10 +254,13 @@ bus_config_load (const DBusString *file, dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL); else dbus_set_error (error, DBUS_ERROR_FAILED, - "Error in file %s, line %d, column %d: %s\n", + "Error in file %s, line %lu, column %lu: %s\n", filename, - XML_GetCurrentLineNumber (expat), - XML_GetCurrentColumnNumber (expat), + /* The XML_Size type varies according to + * build options, so cast to something we can + * cope with. */ + (unsigned long) XML_GetCurrentLineNumber (expat), + (unsigned long) XML_GetCurrentColumnNumber (expat), XML_ErrorString (e)); } -- 2.9.3