diff options
| author | David Robillard <d@drobilla.net> | 2021-02-20 16:47:55 -0500 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2021-03-07 15:32:24 -0500 |
| commit | 941b14a0ab8f7c80f94e04762e65a48f9ed02f6e (patch) | |
| tree | a7e89d7d2bb0150728c5eec3d4d9e6730f9af016 /src/serdi.c | |
| parent | d243368f8e2f79a125a5858223f71fb40fe84525 (diff) | |
| download | serd-941b14a0ab8f7c80f94e04762e65a48f9ed02f6e.tar.gz serd-941b14a0ab8f7c80f94e04762e65a48f9ed02f6e.tar.bz2 serd-941b14a0ab8f7c80f94e04762e65a48f9ed02f6e.zip | |
Simplify URI API and implementation
Diffstat (limited to 'src/serdi.c')
| -rw-r--r-- | src/serdi.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/serdi.c b/src/serdi.c index 3d3b414c..b391f549 100644 --- a/src/serdi.c +++ b/src/serdi.c @@ -286,7 +286,7 @@ main(int argc, char** argv) in_name = in_name ? in_name : input; if (!in_fd) { if (!strncmp(input, "file:", 5)) { - input_path = serd_file_uri_parse(input, NULL); + input_path = serd_parse_file_uri(input, NULL); input = input_path; } if (!input || !(in_fd = serd_fopen(input, "rb"))) { @@ -312,7 +312,8 @@ main(int argc, char** argv) SerdURIView base_uri = SERD_URI_NULL; SerdNode* base = NULL; if (a < argc) { // Base URI given on command line - base = serd_new_uri_from_string((const char*)argv[a], NULL, &base_uri); + base_uri = serd_parse_uri(argv[a]); + base = serd_new_parsed_uri(base_uri); } else if (from_file && in_fd != stdin) { // Use input file URI base = serd_new_file_uri(input, NULL, &base_uri); } |