Added struct raptor_message_handler_closure for user data plus an

error handler.
(raptor_log_error_simple): Removed, only used in raptor_sax2.c
(raptor_log_error_to_handlers): Added to log to an
raptor_error_handlers object.
(raptor_sax2_simple_error): Tidy erorr calling to use closure
pointer.
(raptor_sax2_parse_chunk, raptor_log_error_to_handlers): Use
raptor_log_error_to_handlers
(raptor_www_set_error_handler, raptor_www_error): Update for closure
struct.
(raptor_grddl_fetch_uri, raptor_grddl_parse_chunk): Update for
closure struct.  Tidy saving and restoring error handlers
(raptor_new_parser): Init last_log_level for error handlers.
(raptor_parse_uri_with_connection, raptor_parser_simple_error,
raptor_parser_error_varargs, raptor_parser_error_message_handler,
raptor_parser_warning, raptor_parser_warning_message_handler,
raptor_set_fatal_error_handler, raptor_set_error_handler,
raptor_set_warning_handler): Update for closure struct.
(raptor_libxml_warning, raptor_libxml_error_common,
raptor_libxml_generic_error, raptor_libxml_xmlStructuredErrorFunc):
Update for closure struct.
(raptor_www_libxml_init): Update for closure struct.

1 files changed, 13 insertions, 13 deletions

diff --git a/src/raptor_libxml.c b/src/raptor_libxml.c
index 8f03ff13..92024795 100644
--- a/src/raptor_libxml.c
+++ b/src/raptor_libxml.c
@@ -271,8 +271,8 @@ raptor_libxml_warning(void* user_data, const char *msg, ...)
   }
   
   raptor_log_error_varargs(RAPTOR_LOG_LEVEL_WARNING,
-                           sax2->error_handlers->handlers[RAPTOR_LOG_LEVEL_WARNING],
-                           sax2->error_handlers->user_data[RAPTOR_LOG_LEVEL_WARNING],
+                           sax2->error_handlers->handlers[RAPTOR_LOG_LEVEL_WARNING].handler,
+                           sax2->error_handlers->handlers[RAPTOR_LOG_LEVEL_WARNING].user_data,
                            sax2->locator, 
                            nmsg ? nmsg : msg, 
                            args);
@@ -316,15 +316,15 @@ raptor_libxml_error_common(void* user_data, const char *msg, va_list args,
 
   if(is_fatal)
     raptor_log_error_varargs(RAPTOR_LOG_LEVEL_FATAL,
-                             sax2->error_handlers->handlers[RAPTOR_LOG_LEVEL_FATAL], 
-                             sax2->error_handlers->user_data[RAPTOR_LOG_LEVEL_FATAL],
+                             sax2->error_handlers->handlers[RAPTOR_LOG_LEVEL_FATAL].handler, 
+                             sax2->error_handlers->handlers[RAPTOR_LOG_LEVEL_FATAL].user_data,
                              sax2->locator, 
                              nmsg ? nmsg : msg, 
                              args);
   else
     raptor_log_error_varargs(RAPTOR_LOG_LEVEL_ERROR,
-                             sax2->error_handlers->handlers[RAPTOR_LOG_LEVEL_ERROR], 
-                             sax2->error_handlers->user_data[RAPTOR_LOG_LEVEL_ERROR],
+                             sax2->error_handlers->handlers[RAPTOR_LOG_LEVEL_ERROR].handler,
+                             sax2->error_handlers->handlers[RAPTOR_LOG_LEVEL_ERROR].user_data,
                              sax2->locator, 
                              nmsg ? nmsg : msg, 
                              args);
@@ -370,8 +370,8 @@ raptor_libxml_generic_error(void* user_data, const char *msg, ...)
   }
 
   raptor_log_error_varargs(RAPTOR_LOG_LEVEL_ERROR,
-                           error_handlers->handlers[RAPTOR_LOG_LEVEL_ERROR], 
-                           error_handlers->user_data[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);
@@ -429,8 +429,8 @@ raptor_libxml_validation_warning(void* user_data, const char *msg, ...)
   }
 
   raptor_log_error_varargs(RAPTOR_LOG_LEVEL_WARNING,
-                           sax2->error_handlers->handlers[RAPTOR_LOG_LEVEL_WARNING], 
-                           sax2->error_handlers->user_data[RAPTOR_LOG_LEVEL_WARNING],
+                           sax2->error_handlers->handlers[RAPTOR_LOG_LEVEL_WARNING].handler,
+                           sax2->error_handlers->handlers[RAPTOR_LOG_LEVEL_WARNING].user_data,
                            sax2->locator, 
                            nmsg ? nmsg : msg, 
                            args);
@@ -678,9 +678,9 @@ raptor_libxml_xmlStructuredErrorFunc(void *user_data, xmlErrorPtr err)
   else
     level=RAPTOR_LOG_LEVEL_WARNING;
 
-  if(error_handlers) {
-    handler=error_handlers->handlers[level];
-    handler_data=error_handlers->user_data[level];
+  if(error_handlers && level <= error_handlers->last_log_level) {
+    handler=error_handlers->handlers[level].handler;
+    handler_data=error_handlers->handlers[level].user_data;
   }
 
   raptor_log_error(level, handler, handler_data,