diff options
| -rw-r--r-- | serd/serd.h | 6 | ||||
| -rw-r--r-- | src/node.c | 6 | ||||
| -rw-r--r-- | src/node.h | 6 | ||||
| -rw-r--r-- | src/reader.c | 7 | ||||
| -rw-r--r-- | src/reader.h | 20 |
5 files changed, 25 insertions, 20 deletions
diff --git a/serd/serd.h b/serd/serd.h index dfd53480..130e7959 100644 --- a/serd/serd.h +++ b/serd/serd.h @@ -223,7 +223,7 @@ typedef enum { <tt>nodeID</tt></a> */ SERD_BLANK = 4 -} SerdType; +} SerdNodeType; /** Flags indicating certain string properties relevant to serialisation. @@ -620,7 +620,7 @@ serd_uri_serialise_relative(const SerdURI* uri, */ SERD_API SerdNode* -serd_new_simple_node(SerdType type, const char* str, size_t len); +serd_new_simple_node(SerdNodeType type, const char* str, size_t len); /** Create a new plain literal string node from `str`. @@ -838,7 +838,7 @@ serd_new_blob(const void* buf, Return the type of a node (SERD_URI, SERD_BLANK, or SERD_LITERAL). */ SERD_API -SerdType +SerdNodeType serd_node_get_type(const SerdNode* node); /** @@ -98,7 +98,7 @@ serd_node_total_size(const SerdNode* node) } SerdNode* -serd_node_malloc(size_t n_bytes, SerdNodeFlags flags, SerdType type) +serd_node_malloc(size_t n_bytes, SerdNodeFlags flags, SerdNodeType type) { const size_t size = sizeof(SerdNode) + serd_node_pad_size(n_bytes); SerdNode* node = (SerdNode*)calloc(1, size); @@ -125,7 +125,7 @@ serd_node_set(SerdNode** dst, const SerdNode* src) } SerdNode* -serd_new_simple_node(SerdType type, const char* str, const size_t len) +serd_new_simple_node(SerdNodeType type, const char* str, const size_t len) { if (!str) { return NULL; @@ -697,7 +697,7 @@ serd_new_blob(const void* buf, return node; } -SerdType +SerdNodeType serd_node_get_type(const SerdNode* node) { return node->type; @@ -24,7 +24,7 @@ struct SerdNodeImpl { size_t n_bytes; /**< Size in bytes (not including null) */ SerdNodeFlags flags; /**< Node flags (e.g. string properties) */ - SerdType type; /**< Node type */ + SerdNodeType type; /**< Node type */ }; static inline char* @@ -39,7 +39,9 @@ serd_node_buffer_c(const SerdNode* node) return (const char*)(node + 1); } -SerdNode* serd_node_malloc(size_t n_bytes, SerdNodeFlags flags, SerdType type); +SerdNode* +serd_node_malloc(size_t n_bytes, SerdNodeFlags flags, SerdNodeType type); + void serd_node_set(SerdNode** dst, const SerdNode* src); size_t serd_node_total_size(const SerdNode* node); void serd_node_zero_pad(SerdNode* node); diff --git a/src/reader.c b/src/reader.c index 7dd0eff3..778616d2 100644 --- a/src/reader.c +++ b/src/reader.c @@ -75,7 +75,7 @@ blank_id(SerdReader* reader) SerdNode* push_node_padded(SerdReader* reader, size_t maxlen, - SerdType type, const char* str, size_t n_bytes) + SerdNodeType type, const char* str, size_t n_bytes) { // Push a null byte to ensure the previous node was null terminated char* terminator = (char*)serd_stack_push(&reader->stack, 1); @@ -109,7 +109,10 @@ push_node_padded(SerdReader* reader, size_t maxlen, } SerdNode* -push_node(SerdReader* reader, SerdType type, const char* str, size_t n_bytes) +push_node(SerdReader* reader, + SerdNodeType type, + const char* str, + size_t n_bytes) { return push_node_padded(reader, n_bytes, type, str, n_bytes); } diff --git a/src/reader.h b/src/reader.h index 9f087d7e..3d59bf9c 100644 --- a/src/reader.h +++ b/src/reader.h @@ -76,16 +76,16 @@ struct SerdReaderImpl { SERD_LOG_FUNC(3, 4) SerdStatus r_err(SerdReader* reader, SerdStatus st, const char* fmt, ...); -SerdNode* push_node_padded(SerdReader* reader, - size_t maxlen, - SerdType type, - const char* str, - size_t n_bytes); - -SerdNode* push_node(SerdReader* reader, - SerdType type, - const char* str, - size_t n_bytes); +SerdNode* push_node_padded(SerdReader* reader, + size_t maxlen, + SerdNodeType type, + const char* str, + size_t n_bytes); + +SerdNode* push_node(SerdReader* reader, + SerdNodeType type, + const char* str, + size_t n_bytes); size_t genid_size(SerdReader* reader); SerdNode* blank_id(SerdReader* reader); |