diff options
author | David Robillard <d@drobilla.net> | 2011-01-22 18:32:18 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2011-01-22 18:32:18 +0000 |
commit | 752051a76a46c5d3c19c65ac8a8f24019a81df35 (patch) | |
tree | dd6266c7d1e3b10f125332a065ca131ea937e6dc /src/serdi.c | |
parent | af3398a40718821c03817df32f712cdb2814b077 (diff) | |
download | serd-752051a76a46c5d3c19c65ac8a8f24019a81df35.tar.gz serd-752051a76a46c5d3c19c65ac8a8f24019a81df35.tar.bz2 serd-752051a76a46c5d3c19c65ac8a8f24019a81df35.zip |
SerdNamespaces => SerdEnv.
git-svn-id: http://svn.drobilla.net/serd/trunk@36 490d8e77-9747-427b-9fa3-0b8f29cee8a0
Diffstat (limited to 'src/serdi.c')
-rw-r--r-- | src/serdi.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/serdi.c b/src/serdi.c index 00e687de..73653792 100644 --- a/src/serdi.c +++ b/src/serdi.c @@ -22,10 +22,10 @@ #include "serd/serd.h" typedef struct { - SerdWriter writer; - SerdNamespaces ns; - SerdString* base_uri_str; - SerdURI base_uri; + SerdWriter writer; + SerdEnv env; + SerdString* base_uri_str; + SerdURI base_uri; } State; static bool @@ -84,10 +84,10 @@ event_prefix(void* handle, } SerdURI new_abs_uri; SerdString* abs_uri_string = serd_string_new_from_uri(&abs_uri, &new_abs_uri); - serd_namespaces_add(state->ns, name, abs_uri_string); + serd_env_add(state->env, name, abs_uri_string); serd_string_free(abs_uri_string); } else { - serd_namespaces_add(state->ns, name, uri_string); + serd_env_add(state->env, name, uri_string); } serd_writer_set_prefix(state->writer, name, uri_string); @@ -205,7 +205,7 @@ main(int argc, char** argv) return 1; } - SerdNamespaces ns = serd_namespaces_new(); + SerdEnv env = serd_env_new(); SerdStyle output_style = (output_syntax == SERD_NTRIPLES) ? SERD_STYLE_ASCII @@ -213,8 +213,8 @@ main(int argc, char** argv) State state = { serd_writer_new(output_syntax, output_style, - ns, &base_uri, file_sink, out_fd), - ns, base_uri_str, base_uri + env, &base_uri, file_sink, out_fd), + env, base_uri_str, base_uri }; SerdReader reader = serd_reader_new( @@ -227,7 +227,7 @@ main(int argc, char** argv) serd_writer_finish(state.writer); serd_writer_free(state.writer); - serd_namespaces_free(state.ns); + serd_env_free(state.env); serd_string_free(state.base_uri_str); if (success) { |