summaryrefslogtreecommitdiff
path: root/src/raptor_libxml.c
diff options
context:
space:
mode:
authorDave Beckett <dave@dajobe.org>2010-01-08 13:37:37 -0800
committerDave Beckett <dave@dajobe.org>2010-01-08 13:37:37 -0800
commita0a5510265c28e9eb6e3b8fd2758348772cc8a40 (patch)
tree27730f42138465ac02ee655b8aa86cce935e7281 /src/raptor_libxml.c
parentb862476878a2270a97f78308370ba18c2748ff3a (diff)
downloadraptor-a0a5510265c28e9eb6e3b8fd2758348772cc8a40.tar.gz
raptor_log_error_varargs no longer needs/users error handler/data args
(raptor_log_error_varargs): Remove args and pick handler and handler data from world error_handlers. Update all callers of above.
Diffstat (limited to 'src/raptor_libxml.c')
-rw-r--r--src/raptor_libxml.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/src/raptor_libxml.c b/src/raptor_libxml.c
index 80c2beaf..945b2113 100644
--- a/src/raptor_libxml.c
+++ b/src/raptor_libxml.c
@@ -272,8 +272,6 @@ raptor_libxml_warning(void* user_data, const char *msg, ...)
raptor_log_error_varargs(sax2->world,
RAPTOR_LOG_LEVEL_WARNING,
- sax2->world->error_handlers.handlers[RAPTOR_LOG_LEVEL_WARNING].handler,
- sax2->world->error_handlers.handlers[RAPTOR_LOG_LEVEL_WARNING].user_data,
sax2->locator,
nmsg ? nmsg : msg,
args);
@@ -318,16 +316,12 @@ raptor_libxml_error_common(void* user_data, const char *msg, va_list args,
if(is_fatal)
raptor_log_error_varargs(sax2->world,
RAPTOR_LOG_LEVEL_FATAL,
- sax2->world->error_handlers.handlers[RAPTOR_LOG_LEVEL_FATAL].handler,
- sax2->world->error_handlers.handlers[RAPTOR_LOG_LEVEL_FATAL].user_data,
sax2->locator,
nmsg ? nmsg : msg,
args);
else
raptor_log_error_varargs(sax2->world,
RAPTOR_LOG_LEVEL_ERROR,
- sax2->world->error_handlers.handlers[RAPTOR_LOG_LEVEL_ERROR].handler,
- sax2->world->error_handlers.handlers[RAPTOR_LOG_LEVEL_ERROR].user_data,
sax2->locator,
nmsg ? nmsg : msg,
args);
@@ -374,8 +368,6 @@ raptor_libxml_generic_error(void* user_data, const char *msg, ...)
raptor_log_error_varargs(error_handlers->world,
RAPTOR_LOG_LEVEL_ERROR,
- error_handlers->handlers[RAPTOR_LOG_LEVEL_ERROR].handler,
- error_handlers->handlers[RAPTOR_LOG_LEVEL_ERROR].user_data,
error_handlers->locator,
nmsg ? nmsg : msg,
args);
@@ -434,8 +426,6 @@ raptor_libxml_validation_warning(void* user_data, const char *msg, ...)
raptor_log_error_varargs(sax2->world,
RAPTOR_LOG_LEVEL_WARNING,
- sax2->world->error_handlers.handlers[RAPTOR_LOG_LEVEL_WARNING].handler,
- sax2->world->error_handlers.handlers[RAPTOR_LOG_LEVEL_WARNING].user_data,
sax2->locator,
nmsg ? nmsg : msg,
args);