diff options
| -rw-r--r-- | src/raptor.h | 2 | ||||
| -rw-r--r-- | src/raptor_namespace.c | 8 | ||||
| -rw-r--r-- | src/raptor_rss.c | 4 | ||||
| -rw-r--r-- | src/raptor_serialize_dot.c | 5 | ||||
| -rw-r--r-- | src/raptor_serialize_rdfxml.c | 5 | ||||
| -rw-r--r-- | src/raptor_serialize_rdfxmla.c | 5 | ||||
| -rw-r--r-- | src/raptor_serialize_rss.c | 5 | ||||
| -rw-r--r-- | src/raptor_serialize_turtle.c | 5 | ||||
| -rw-r--r-- | src/raptor_turtle_writer.c | 9 | ||||
| -rw-r--r-- | src/raptor_xml_writer.c | 8 |
10 files changed, 14 insertions, 42 deletions
diff --git a/src/raptor.h b/src/raptor.h index 8950d669..d7dedc2c 100644 --- a/src/raptor.h +++ b/src/raptor.h @@ -1169,7 +1169,7 @@ const unsigned char* raptor_qname_get_counted_value(raptor_qname* name, size_t* RAPTOR_API raptor_namespace* raptor_new_namespace_from_uri(raptor_namespace_stack *nstack, const unsigned char *prefix, raptor_uri* ns_uri, int depth); RAPTOR_API -raptor_namespace_stack* raptor_new_namespaces_v2(raptor_world* world, raptor_simple_message_handler error_handler, void *error_data, int defaults); +raptor_namespace_stack* raptor_new_namespaces_v2(raptor_world* world, int defaults); RAPTOR_API int raptor_namespaces_init_v2(raptor_world* world, raptor_namespace_stack *nstack, int defaults); RAPTOR_API diff --git a/src/raptor_namespace.c b/src/raptor_namespace.c index 70e0180b..9d782822 100644 --- a/src/raptor_namespace.c +++ b/src/raptor_namespace.c @@ -188,8 +188,6 @@ raptor_namespaces_init_v2(raptor_world* world, /** * raptor_new_namespaces_v2: * @world: raptor_world object - * @error_handler: error handler function - * @error_data: error handler data * @defaults: namespaces to initialise * * Constructor - create a new #raptor_namespace_stack. @@ -200,11 +198,11 @@ raptor_namespaces_init_v2(raptor_world* world, **/ raptor_namespace_stack * raptor_new_namespaces_v2(raptor_world* world, - raptor_simple_message_handler error_handler, - void *error_data, int defaults) { - raptor_namespace_stack *nstack = (raptor_namespace_stack *)RAPTOR_CALLOC(raptor_namespace_stack, 1, sizeof(raptor_namespace_stack)); + raptor_namespace_stack *nstack; + nstack = (raptor_namespace_stack *)RAPTOR_CALLOC(raptor_namespace_stack, + 1, sizeof(raptor_namespace_stack)); if(!nstack) return NULL; diff --git a/src/raptor_rss.c b/src/raptor_rss.c index d9be820c..a7ee0584 100644 --- a/src/raptor_rss.c +++ b/src/raptor_rss.c @@ -176,9 +176,7 @@ raptor_rss_parse_init(raptor_parser* rdf_parser, const char *name) rss_parser->sax2 = NULL; } - rss_parser->nstack = raptor_new_namespaces_v2(rdf_parser->world, - NULL, NULL, /* errors */ - 1); + rss_parser->nstack = raptor_new_namespaces_v2(rdf_parser->world, 1); /* Initialise the namespaces */ for(n = 0; n < RAPTOR_RSS_NAMESPACES_SIZE; n++) { diff --git a/src/raptor_serialize_dot.c b/src/raptor_serialize_dot.c index e373f71a..0991850d 100644 --- a/src/raptor_serialize_dot.c +++ b/src/raptor_serialize_dot.c @@ -323,10 +323,7 @@ raptor_dot_serializer_init(raptor_serializer *serializer, const char *name) raptor_dot_context * context = (raptor_dot_context *)serializer->context; /* Setup namespace handling */ - context->nstack = - raptor_new_namespaces_v2(serializer->world, - (raptor_simple_message_handler)raptor_serializer_simple_error, - serializer, 1); + context->nstack = raptor_new_namespaces_v2(serializer->world, 1); context->namespaces = raptor_new_sequence((raptor_sequence_free_handler *)raptor_free_namespace, NULL); /* We keep a list of nodes to avoid duplication (which isn't diff --git a/src/raptor_serialize_rdfxml.c b/src/raptor_serialize_rdfxml.c index 7826bc0b..058a541b 100644 --- a/src/raptor_serialize_rdfxml.c +++ b/src/raptor_serialize_rdfxml.c @@ -89,10 +89,7 @@ raptor_rdfxml_serialize_init(raptor_serializer* serializer, const char *name) { raptor_rdfxml_serializer_context* context = (raptor_rdfxml_serializer_context*)serializer->context; - context->nstack = raptor_new_namespaces_v2(serializer->world, - (raptor_simple_message_handler)raptor_serializer_simple_error, - serializer, - 1); + context->nstack = raptor_new_namespaces_v2(serializer->world, 1); if(!context->nstack) return 1; context->xml_nspace = raptor_new_namespace(context->nstack, diff --git a/src/raptor_serialize_rdfxmla.c b/src/raptor_serialize_rdfxmla.c index 285d78b4..528be940 100644 --- a/src/raptor_serialize_rdfxmla.c +++ b/src/raptor_serialize_rdfxmla.c @@ -858,10 +858,7 @@ raptor_rdfxmla_serialize_init(raptor_serializer* serializer, const char *name) raptor_rdfxmla_context* context = (raptor_rdfxmla_context*)serializer->context; raptor_uri *rdf_type_uri; - context->nstack = raptor_new_namespaces_v2(serializer->world, - (raptor_simple_message_handler)raptor_serializer_simple_error, - serializer, - 1); + context->nstack = raptor_new_namespaces_v2(serializer->world, 1); if(!context->nstack) return 1; diff --git a/src/raptor_serialize_rss.c b/src/raptor_serialize_rss.c index cb5dbeed..954f7a52 100644 --- a/src/raptor_serialize_rss.c +++ b/src/raptor_serialize_rss.c @@ -208,10 +208,7 @@ raptor_rss10_serialize_init(raptor_serializer* serializer, const char *name) rss_serializer->is_atom=!(strcmp(name,"atom")); - rss_serializer->nstack = raptor_new_namespaces_v2(serializer->world, - (raptor_simple_message_handler)raptor_serializer_simple_error, - serializer, - 1); + rss_serializer->nstack = raptor_new_namespaces_v2(serializer->world, 1); rss_serializer->xml_literal_dt = raptor_new_uri_v2(serializer->world, raptor_xml_literal_datatype_uri_string); diff --git a/src/raptor_serialize_turtle.c b/src/raptor_serialize_turtle.c index 4d4e2697..8a30cc2a 100644 --- a/src/raptor_serialize_turtle.c +++ b/src/raptor_serialize_turtle.c @@ -749,10 +749,7 @@ raptor_turtle_serialize_init(raptor_serializer* serializer, const char *name) raptor_turtle_context* context = (raptor_turtle_context*)serializer->context; raptor_uri *rdf_type_uri; - context->nstack = raptor_new_namespaces_v2(serializer->world, - (raptor_simple_message_handler)raptor_serializer_simple_error, - serializer, - 1); + context->nstack = raptor_new_namespaces_v2(serializer->world, 1); if(!context->nstack) return 1; context->rdf_nspace = raptor_new_namespace(context->nstack, diff --git a/src/raptor_turtle_writer.c b/src/raptor_turtle_writer.c index 7a7c84c3..e95a14f9 100644 --- a/src/raptor_turtle_writer.c +++ b/src/raptor_turtle_writer.c @@ -177,10 +177,7 @@ raptor_new_turtle_writer(raptor_world* world, turtle_writer->nstack = nstack; if(!turtle_writer->nstack) { - turtle_writer->nstack = nstack = raptor_new_namespaces_v2(world, - error_handler, - error_data, - 1); + turtle_writer->nstack = nstack = raptor_new_namespaces_v2(world, 1); turtle_writer->my_nstack = 1; } @@ -930,9 +927,7 @@ main(int argc, char *argv[]) exit(1); } - nstack = raptor_new_namespaces_v2(world, - NULL, NULL, /* errors */ - 1); + nstack = raptor_new_namespaces_v2(world, 1); base_uri = raptor_new_uri_v2(world, base_uri_string); diff --git a/src/raptor_xml_writer.c b/src/raptor_xml_writer.c index f9d5f24f..4f91380e 100644 --- a/src/raptor_xml_writer.c +++ b/src/raptor_xml_writer.c @@ -450,9 +450,7 @@ raptor_new_xml_writer_v2(raptor_world* world, xml_writer->nstack = nstack; if(!xml_writer->nstack) { - xml_writer->nstack = nstack = raptor_new_namespaces_v2(world, - error_handler, error_data, - 1); + xml_writer->nstack = nstack = raptor_new_namespaces_v2(world, 1); xml_writer->my_nstack = 1; } @@ -1137,9 +1135,7 @@ main(int argc, char *argv[]) exit(1); } - nstack = raptor_new_namespaces_v2(world, - NULL, NULL, /* errors */ - 1); + nstack = raptor_new_namespaces_v2(world, 1); xml_writer = raptor_new_xml_writer_v2(world, nstack, |