Remove _v2 from name and world arg from raptor_locator functions

(raptor_print_locator): Renamed from raptor_print_locator_v2 and
loses world arg.

(raptor_format_locator): Renamed from raptor_format_locator_v2 and
loses world arg.

(raptor_locator_uri_string): Renamed from raptor_locator_uri_v2 and
renamed to reflect returns a string not a raptor_uri*

1 files changed, 3 insertions, 3 deletions

diff --git a/utils/rapper.c b/utils/rapper.c
index ec9027a0..96e20810 100644
--- a/utils/rapper.c
+++ b/utils/rapper.c
@@ -227,7 +227,7 @@ rdfdump_error_handler(void *data, raptor_locator *locator,
   
   if(!ignore_errors) {
     fprintf(stderr, "%s: Error - ", program);
-    raptor_print_locator_v2(raptor_parser_get_world(parser), stderr, locator);
+    raptor_print_locator(stderr, locator);
     fprintf(stderr, " - %s\n", message);
     
     raptor_parse_abort(parser);
@@ -241,11 +241,11 @@ static void
 rdfdump_warning_handler(void *data, raptor_locator *locator,
                         const char *message) 
 {
-  raptor_parser *parser = (raptor_parser *)data;
+  /* raptor_parser *parser = (raptor_parser *)data; */
 
   if(!ignore_warnings) {
     fprintf(stderr, "%s: Warning - ", program);
-    raptor_print_locator_v2(raptor_parser_get_world(parser), stderr, locator);
+    raptor_print_locator(stderr, locator);
     fprintf(stderr, " - %s\n", message);
   }