diff options
| author | David Robillard <d@drobilla.net> | 2011-05-11 23:32:18 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2011-05-11 23:32:18 +0000 |
| commit | 3feaad1a898d40e54f3ef7e076a05dd960eefefa (patch) | |
| tree | 3c4e557a8ca63b78470d530e0efe10263cee9bc5 /src/syntax.c | |
| parent | 9f6becfdd80dfe4cf1d99d0aefa8b257eb1b0c8d (diff) | |
| download | sord-3feaad1a898d40e54f3ef7e076a05dd960eefefa.tar.gz sord-3feaad1a898d40e54f3ef7e076a05dd960eefefa.tar.bz2 sord-3feaad1a898d40e54f3ef7e076a05dd960eefefa.zip | |
Pass environment to sord write methods for CURIE abbreviation.
git-svn-id: http://svn.drobilla.net/sord/trunk@108 3d64ff67-21c5-427c-a301-fe4f08042e5a
Diffstat (limited to 'src/syntax.c')
| -rw-r--r-- | src/syntax.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/syntax.c b/src/syntax.c index 1964d24..ff2f248 100644 --- a/src/syntax.c +++ b/src/syntax.c @@ -207,6 +207,7 @@ sord_file_uri_to_path(const uint8_t* uri) SORD_API bool sord_read_file(SordModel* model, + SerdEnv* env, const uint8_t* uri, SordNode* graph, const uint8_t* blank_prefix) @@ -223,7 +224,8 @@ sord_read_file(SordModel* model, return false; } - const bool ret = sord_read_file_handle(model, fd, uri, graph, blank_prefix); + const bool ret = sord_read_file_handle( + model, env, fd, uri, graph, blank_prefix); fclose(fd); return ret; } @@ -231,6 +233,7 @@ sord_read_file(SordModel* model, SORD_API bool sord_read_file_handle(SordModel* model, + SerdEnv* env, FILE* fd, const uint8_t* base_uri_str_in, SordNode* graph, @@ -244,8 +247,6 @@ sord_read_file_handle(SordModel* model, fprintf(stderr, "Invalid base URI <%s>\n", base_uri_str); } - SerdEnv* env = serd_env_new(); - SerdNode base_uri_node = serd_node_from_string(SERD_URI, base_uri_str); serd_env_set_base_uri(env, &base_uri_node); @@ -263,7 +264,6 @@ sord_read_file_handle(SordModel* model, const SerdStatus ret = serd_reader_read_file(state.reader, fd, base_uri_str); serd_reader_free(state.reader); - serd_env_free(env); free(base_uri_str); return (ret == SERD_SUCCESS); @@ -272,6 +272,7 @@ sord_read_file_handle(SordModel* model, SORD_API bool sord_read_string(SordModel* model, + SerdEnv* env, const uint8_t* str, const uint8_t* base_uri_str_in) { @@ -283,8 +284,6 @@ sord_read_string(SordModel* model, fprintf(stderr, "Invalid base URI <%s>\n", base_uri_str); } - SerdEnv* env = serd_env_new(); - SerdNode base_uri_node = serd_node_from_string(SERD_URI, base_uri_str); serd_env_set_base_uri(env, &base_uri_node); @@ -298,7 +297,6 @@ sord_read_string(SordModel* model, const SerdStatus status = serd_reader_read_string(state.reader, str); serd_reader_free(state.reader); - serd_env_free(env); free(base_uri_str); return (status == SERD_SUCCESS); |