From c10db88a4eac181e83acff319e77308291c59645 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Wed, 13 Jun 2018 17:11:13 -0400 Subject: Remove escape parameter from serd_new_file_uri Since characters are escaped because they are not valid characters in a URI, any use of this function without escaping is problematic at best. --- tests/serd_test.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'tests') diff --git a/tests/serd_test.c b/tests/serd_test.c index 3d05275a..b37b7401 100644 --- a/tests/serd_test.c +++ b/tests/serd_test.c @@ -84,7 +84,6 @@ test_sink(void* handle, static int check_file_uri(const char* hostname, const char* path, - bool escape, const char* expected_uri, const char* expected_path) { @@ -92,7 +91,7 @@ check_file_uri(const char* hostname, expected_path = path; } - SerdNode* node = serd_new_file_uri(path, hostname, escape); + SerdNode* node = serd_new_file_uri(path, hostname); const char* node_str = serd_node_get_string(node); char* out_hostname = NULL; char* out_path = serd_file_uri_parse(node_str, &out_hostname); @@ -260,18 +259,16 @@ main(void) // Test file URI escaping and parsing - if (check_file_uri(NULL, "C:/My 100%", true, + if (check_file_uri(NULL, "C:/My 100%", "file:///C:/My%20100%%", NULL) || - check_file_uri("ahost", "C:\\Pointless Space", true, + check_file_uri("ahost", "C:\\Pointless Space", "file://ahost/C:/Pointless%20Space", "C:/Pointless Space") || - check_file_uri(NULL, "/foo/bar", true, + check_file_uri(NULL, "/foo/bar", "file:///foo/bar", NULL) || - check_file_uri("bhost", "/foo/bar", true, + check_file_uri("bhost", "/foo/bar", "file://bhost/foo/bar", NULL) || - check_file_uri(NULL, "a/relative path", false, - "a/relative path", NULL) || - check_file_uri(NULL, "a/relative ", true, + check_file_uri(NULL, "a/relative ", "a/relative%20%3Cpath%3E", NULL)) { return 1; } -- cgit v1.2.1