diff options
| author | David Robillard <d@drobilla.net> | 2021-02-20 16:47:55 -0500 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2022-01-13 20:05:40 -0500 |
| commit | a25c9927ce648bc83064bb8ea91c9ca8b8a9582f (patch) | |
| tree | 26a80c2d82199263fb1dde9c0c453596e7948218 /src/serdi.c | |
| parent | 33df293ad33cc2cd56e121770ecc2a684f181f2c (diff) | |
| download | serd-a25c9927ce648bc83064bb8ea91c9ca8b8a9582f.tar.gz serd-a25c9927ce648bc83064bb8ea91c9ca8b8a9582f.tar.bz2 serd-a25c9927ce648bc83064bb8ea91c9ca8b8a9582f.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 babe4575..e86042bb 100644 --- a/src/serdi.c +++ b/src/serdi.c @@ -293,7 +293,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"))) { @@ -319,7 +319,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); } |