diff options
| author | David Robillard <d@drobilla.net> | 2018-05-11 18:11:44 +0200 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2018-05-27 18:23:15 +0200 |
| commit | 4bc530b356ed4b390816669725e684d038e48aa0 (patch) | |
| tree | 4a79ccbd7e3fa8dc53f85d93fab19d09f99c5c0d /src/serdi.c | |
| parent | 1f4990c7d2e297dc0252ff193e66339d8db38837 (diff) | |
| download | serd-4bc530b356ed4b390816669725e684d038e48aa0.tar.gz serd-4bc530b356ed4b390816669725e684d038e48aa0.tar.bz2 serd-4bc530b356ed4b390816669725e684d038e48aa0.zip | |
Clean up node construction API
Diffstat (limited to 'src/serdi.c')
| -rw-r--r-- | src/serdi.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/serdi.c b/src/serdi.c index ad52de3d..6efce26e 100644 --- a/src/serdi.c +++ b/src/serdi.c @@ -212,13 +212,11 @@ main(int argc, char** argv) : SERD_NQUADS); } - SerdURI base_uri = SERD_URI_NULL; - SerdNode* base = NULL; + SerdNode* base = NULL; if (a < argc) { // Base URI given on command line - base = serd_node_new_uri_from_string( - (const char*)argv[a], NULL, &base_uri); + base = serd_node_new_uri((const char*)argv[a]); } else if (!from_string && !from_stdin) { // Use input file URI - base = serd_node_new_file_uri(input, NULL, &base_uri, true); + base = serd_node_new_file_uri(input, NULL, true); } FILE* out_fd = stdout; @@ -247,7 +245,7 @@ main(int argc, char** argv) SerdWriter* writer = serd_writer_new( world, output_syntax, (SerdStyle)output_style, - env, &base_uri, serd_file_sink, out_fd); + env, serd_file_sink, out_fd); SerdReader* reader = serd_reader_new( world, input_syntax, serd_writer_get_sink_interface(writer)); @@ -257,7 +255,7 @@ main(int argc, char** argv) serd_world_set_error_sink(world, quiet_error_sink, NULL); } - SerdNode* root = serd_node_new_string(SERD_URI, root_uri); + SerdNode* root = serd_node_new_uri(root_uri); serd_writer_set_root_uri(writer, root); serd_writer_chop_blank_prefix(writer, chop_prefix); serd_reader_add_blank_prefix(reader, add_prefix); |