aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2018-02-04 20:49:28 +0100
committerDavid Robillard <d@drobilla.net>2019-04-13 19:15:32 +0200
commita0b173de316be27bea4cd00cd88c9bf65016df45 (patch)
treea8c9d4a0cb3e6c677660f8335c8dcae25871be4c /src
parent2cdb106b83c9e471a9a8ee9ba623d9943323e58e (diff)
downloadserd-a0b173de316be27bea4cd00cd88c9bf65016df45.tar.gz
serd-a0b173de316be27bea4cd00cd88c9bf65016df45.tar.bz2
serd-a0b173de316be27bea4cd00cd88c9bf65016df45.zip
Remove serd_uri_to_path()
Diffstat (limited to 'src')
-rw-r--r--src/serdi.c9
-rw-r--r--src/uri.c23
2 files changed, 7 insertions, 25 deletions
diff --git a/src/serdi.c b/src/serdi.c
index f6b7c529..a631aebf 100644
--- a/src/serdi.c
+++ b/src/serdi.c
@@ -211,11 +211,15 @@ main(int argc, char** argv)
_setmode(fileno(stdout), _O_BINARY);
#endif
- const char* input = (const char*)argv[a++];
+ char* input_path = NULL;
+ const char* input = (const char*)argv[a++];
if (from_file) {
in_name = in_name ? in_name : input;
if (!in_fd) {
- input = serd_uri_to_path(in_name);
+ if (!strncmp(input, "file:", 5)) {
+ input_path = serd_file_uri_parse(input, NULL);
+ input = input_path;
+ }
if (!input || !(in_fd = serd_fopen(input, "rb"))) {
return 1;
}
@@ -306,6 +310,7 @@ main(int argc, char** argv)
serd_writer_free(writer);
serd_env_free(env);
serd_node_free(base);
+ free(input_path);
if (from_file) {
fclose(in_fd);
diff --git a/src/uri.c b/src/uri.c
index 47d7aa0c..9cf6a2a6 100644
--- a/src/uri.c
+++ b/src/uri.c
@@ -19,29 +19,6 @@
#include <stdlib.h>
#include <string.h>
-const char*
-serd_uri_to_path(const char* uri)
-{
- const char* path = uri;
- if (!is_windows_path(uri) && serd_uri_string_has_scheme(uri)) {
- if (strncmp(uri, "file:", 5)) {
- fprintf(stderr, "Non-file URI `%s'\n", uri);
- return NULL;
- } else if (!strncmp(uri, "file://localhost/", 17)) {
- path = uri + 16;
- } else if (!strncmp(uri, "file://", 7)) {
- path = uri + 7;
- } else {
- fprintf(stderr, "Invalid file URI `%s'\n", uri);
- return NULL;
- }
- if (is_windows_path(path + 1)) {
- ++path; // Special case for terrible Windows file URIs
- }
- }
- return path;
-}
-
char*
serd_file_uri_parse(const char* uri, char** hostname)
{