From 5671a751a933476b48158c679f7992fdb54abc7c Mon Sep 17 00:00:00 2001 From: Gergely Polonkai Date: Thu, 17 Jul 2014 23:08:34 +0200 Subject: [PATCH] =?UTF-8?q?Fix=20error=20messages=20in=20AgChart=E2=80=99s?= =?UTF-8?q?=20get=5Fby=5Fxpath()?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/ag-chart.c | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/src/ag-chart.c b/src/ag-chart.c index 8e34f70..72bacb0 100644 --- a/src/ag-chart.c +++ b/src/ag-chart.c @@ -446,8 +446,9 @@ get_by_xpath(xmlXPathContextPtr xpath_context, g_set_error( err, AG_CHART_ERROR, AG_CHART_ERROR_CORRUPT_FILE, - "File '%s' doesn't look like a valid saved chart.", - uri + "File '%s' doesn't look like a valid saved chart: " + "missing node: %s", + uri, xpath ); xmlXPathFreeObject(xpathObj); @@ -459,8 +460,9 @@ get_by_xpath(xmlXPathContextPtr xpath_context, g_set_error( err, AG_CHART_ERROR, AG_CHART_ERROR_CORRUPT_FILE, - "File '%s' doesn't look like a valid saved chart.", - uri + "File '%s' doesn't look like a valid saved chart: " + "too many node: %s", + uri, xpath ); xmlXPathFreeObject(xpathObj); @@ -469,12 +471,13 @@ get_by_xpath(xmlXPathContextPtr xpath_context, if (xpathObj->nodesetval->nodeNr == 0) { if (value_required) { - g_debug("Too many '%s' nodes", xpath); + g_debug("No '%s' nodes", xpath); g_set_error( err, AG_CHART_ERROR, AG_CHART_ERROR_CORRUPT_FILE, - "File '%s' doesn't look like a valid saved chart.", - uri + "File '%s' doesn't look like a valid saved chart: " + "missing node: %s", + uri, xpath ); xmlXPathFreeObject(xpathObj); @@ -518,8 +521,9 @@ get_by_xpath(xmlXPathContextPtr xpath_context, g_set_error( err, AG_CHART_ERROR, AG_CHART_ERROR_CORRUPT_FILE, - "File '%s' doesn't look like a valid saved chart.", - uri + "File '%s' doesn't look like a valid saved chart: " + "Invalid value in node: %s", + uri, xpath ); ret = NULL; } else { @@ -535,8 +539,9 @@ get_by_xpath(xmlXPathContextPtr xpath_context, g_set_error( err, AG_CHART_ERROR, AG_CHART_ERROR_CORRUPT_FILE, - "File '%s' doesn't look like a valid saved chart.", - uri + "File '%s' doesn't look like a valid saved chart: " + "Invalid value in node: %s", + uri, xpath ); ret = NULL; } else {