diff options
| author | Dave Beckett <dave@dajobe.org> | 2010-01-07 23:10:02 -0800 |
|---|---|---|
| committer | Dave Beckett <dave@dajobe.org> | 2010-01-07 23:10:02 -0800 |
| commit | 8e97598b914b9769ebc3a2442adb3891b6c8894b (patch) | |
| tree | f7cb2993607e8557ae31e52dc0d3e9159ccb2eab /librdfa/rdfa.c | |
| parent | e2abf09127cf53372bde93aa331a1c7dc2a253a5 (diff) | |
| download | raptor-8e97598b914b9769ebc3a2442adb3891b6c8894b.tar.gz | |
Alter raptor_new_sax2() to take world and locator not error_handlers.
struct raptor_sax2_s loses error_handlers field.
(raptor_new_sax2): Change to add world and locator at start; store
them and forget about error_handlers.
(raptor_sax2_simple_error, raptor_sax2_parse_chunk,
raptor_sax2_start_element): Take error handlers from world, not sax2.
(raptor_grddl_parse_init_common, raptor_librdfa_parse_start,
raptor_rdfxml_parse_init, raptor_rss_parse_init): Update to new
raptor_new_sax2 calling convention.
(raptor_libxml_warning, raptor_libxml_error_common,
raptor_libxml_validation_warning): Call error handlers under world
rather than in sax2 error_handlers object.
(raptor_libxml_xmlStructuredErrorFunc): Find error handlers via world.
struct rdfacontext [in librdfa] replaces error_handlers with world and
locator fields for use in calling raptor_new_sax2()
(rdfa_create_new_element_context) [in librdfa]: no need to copy
error_handlers.
(rdfa_parse_start) [in librdfa] use stored world and locator.
Diffstat (limited to 'librdfa/rdfa.c')
| -rw-r--r-- | librdfa/rdfa.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/librdfa/rdfa.c b/librdfa/rdfa.c index 47a9273a..242c54d2 100644 --- a/librdfa/rdfa.c +++ b/librdfa/rdfa.c @@ -340,7 +340,6 @@ static rdfacontext* rdfa_create_new_element_context(rdfalist* context_stack) rval->sax2 = parent_context->sax2; rval->namespace_handler = parent_context->namespace_handler; rval->namespace_handler_user_data = parent_context->namespace_handler_user_data; - rval->error_handlers = parent_context->error_handlers; #endif return rval; @@ -1232,8 +1231,8 @@ int rdfa_parse_start(rdfacontext* context) rdfa_push_item(context->context_stack, context, RDFALIST_FLAG_CONTEXT); #ifdef LIBRDFA_IN_RAPTOR - context->sax2 = raptor_new_sax2(context->context_stack, - context->error_handlers); + context->sax2 = raptor_new_sax2(context->world, context->locator, + context->context_stack); #else #endif |