1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
|
$NetBSD: patch-lasso-xml-tools.c,v 1.1 2011/09/08 00:17:03 joerg Exp $
--- lasso/xml/tools.c.orig 2011-09-07 03:18:42.000000000 +0000
+++ lasso/xml/tools.c
@@ -27,6 +27,7 @@
/* permit importation of timegm for glibc2, wait for people to complain it does not work on their
* system. */
#define _BSD_SOURCE
+#define _NETBSD_SOURCE
#include "private.h"
#include <string.h>
#include <time.h>
@@ -1196,6 +1197,11 @@ lasso_concat_url_query(const char *url,
*
* Return value: TRUE if no error occurred during evaluation, FALSE otherwise.
*/
+static void
+structuredErrorFunc (void *userData, xmlErrorPtr error) {
+ *(int *)userData = error->code;
+}
+
gboolean
lasso_eval_xpath_expression(xmlXPathContextPtr xpath_ctx, const char *expression,
xmlXPathObjectPtr *xpath_object_ptr, int *xpath_error_code)
@@ -1205,10 +1211,6 @@ lasso_eval_xpath_expression(xmlXPathCont
xmlStructuredErrorFunc oldStructuredErrorFunc;
gboolean rc = TRUE;
- void structuredErrorFunc (G_GNUC_UNUSED void *userData, xmlErrorPtr error) {
- errorCode = error->code;
- }
-
g_return_val_if_fail(xpath_ctx != NULL && expression != NULL, FALSE);
if (xpath_error_code) { /* reset */
@@ -1216,6 +1218,7 @@ lasso_eval_xpath_expression(xmlXPathCont
}
oldStructuredErrorFunc = xpath_ctx->error;
xpath_ctx->error = structuredErrorFunc;
+ xpath_ctx->userData = &errorCode;
xpath_object = xmlXPathEvalExpression((xmlChar*)expression, xpath_ctx);
xpath_ctx->error = oldStructuredErrorFunc;
|
