diff options
author | David Robillard <d@drobilla.net> | 2018-04-29 18:29:03 +0200 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2018-05-27 18:23:15 +0200 |
commit | b81b27fd762c3a3880070277a6d563a1c6913c1a (patch) | |
tree | ad3aa5def3cffa2f0d4abf564f748f0aea00e649 /src | |
parent | 3efbbdb49f4122d3879007227eafc5afe520d7c5 (diff) | |
download | serd-b81b27fd762c3a3880070277a6d563a1c6913c1a.tar.gz serd-b81b27fd762c3a3880070277a6d563a1c6913c1a.tar.bz2 serd-b81b27fd762c3a3880070277a6d563a1c6913c1a.zip |
Make serd_node_new_literal take datatype as a node
Diffstat (limited to 'src')
-rw-r--r-- | src/node.c | 14 |
1 files changed, 8 insertions, 6 deletions
@@ -113,9 +113,13 @@ serd_node_new_substring(SerdType type, const char* str, const size_t len) } SerdNode* -serd_node_new_literal(const char* str, const char* datatype, const char* lang) +serd_node_new_literal(const char* str, + const SerdNode* datatype, + const char* lang) { - if (!str || (lang && datatype && strcmp(datatype, NS_RDF "#langString"))) { + if (!str || (lang && datatype && + strcmp(serd_node_buffer_c(datatype), NS_RDF "#langString")) || + (datatype && serd_node_get_type(datatype) != SERD_URI)) { return NULL; } @@ -138,16 +142,14 @@ serd_node_new_literal(const char* str, const char* datatype, const char* lang) memcpy(serd_node_buffer(lang_node), lang, lang_len); } else if (datatype) { flags |= SERD_HAS_DATATYPE; - const size_t datatype_len = strlen(datatype); + const size_t datatype_len = strlen(serd_node_buffer_c(datatype)); const size_t total_len = len + sizeof(SerdNode) + datatype_len; node = serd_node_malloc(total_len, flags, SERD_LITERAL); memcpy(serd_node_buffer(node), str, n_bytes); node->n_bytes = n_bytes; SerdNode* datatype_node = node + 1 + (len / serd_node_align); - datatype_node->type = SERD_URI; - datatype_node->n_bytes = datatype_len; - memcpy(serd_node_buffer(datatype_node), datatype, datatype_len); + memcpy(datatype_node, datatype, sizeof(SerdNode) + datatype_len); } else { node = serd_node_malloc(n_bytes, flags, SERD_LITERAL); memcpy(serd_node_buffer(node), str, n_bytes); |