diff options
| author | David Robillard <d@drobilla.net> | 2019-03-10 12:43:14 +0100 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2020-10-27 13:13:58 +0100 |
| commit | 2504ed048f9e5006bf6845ade3d83771a4885a78 (patch) | |
| tree | 7c72134eafdced3335e09bbed0355b6859916114 | |
| parent | df54e2c8de9be51cd16bdce927b0a03ca9ae3a31 (diff) | |
| download | serd-2504ed048f9e5006bf6845ade3d83771a4885a78.tar.gz serd-2504ed048f9e5006bf6845ade3d83771a4885a78.tar.bz2 serd-2504ed048f9e5006bf6845ade3d83771a4885a78.zip | |
Rename writer flags for consistency with enum type
| -rw-r--r-- | serd/serd.h | 6 | ||||
| -rw-r--r-- | src/serdi.c | 4 | ||||
| -rw-r--r-- | src/writer.c | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/serd/serd.h b/serd/serd.h index cd2a7031..9b8ab66a 100644 --- a/serd/serd.h +++ b/serd/serd.h @@ -261,9 +261,9 @@ typedef struct { always ASCII). */ typedef enum { - SERD_STYLE_ASCII = 1 << 0, ///< Escape all non-ASCII characters - SERD_STYLE_UNQUALIFIED = 1 << 1, ///< Do not shorten URIs into CURIEs - SERD_STYLE_UNRESOLVED = 1 << 2 ///< Do not make URIs relative + SERD_WRITE_ASCII = 1 << 0, ///< Escape all non-ASCII characters + SERD_WRITE_UNQUALIFIED = 1 << 1, ///< Do not shorten URIs into CURIEs + SERD_WRITE_UNRESOLVED = 1 << 2 ///< Do not make URIs relative } SerdWriterFlag; /// Bitwise OR of SerdWriterFlag values diff --git a/src/serdi.c b/src/serdi.c index 15b97d04..cc7c14cc 100644 --- a/src/serdi.c +++ b/src/serdi.c @@ -206,8 +206,8 @@ main(int argc, char** argv) SerdEnv* env = serd_env_new(base); const SerdWriterFlags writer_flags = - ((ascii ? SERD_STYLE_ASCII : 0u) | // - (full_uris ? (SERD_STYLE_UNQUALIFIED | SERD_STYLE_UNRESOLVED) : 0u)); + ((ascii ? SERD_WRITE_ASCII : 0u) | // + (full_uris ? (SERD_WRITE_UNQUALIFIED | SERD_WRITE_UNRESOLVED) : 0u)); const SerdSerialisationFlags serialisation_flags = no_inline ? SERD_NO_INLINE_OBJECTS : 0u; diff --git a/src/writer.c b/src/writer.c index df513342..7a27aa47 100644 --- a/src/writer.c +++ b/src/writer.c @@ -223,7 +223,7 @@ write_character(SerdWriter* writer, const uint8_t* utf8, size_t* size) break; } - if (!(writer->flags & SERD_STYLE_ASCII)) { + if (!(writer->flags & SERD_WRITE_ASCII)) { // Write UTF-8 character directly to UTF-8 output return sink(utf8, *size, writer); } @@ -569,7 +569,7 @@ write_uri_node(SerdWriter* const writer, serd_node_equals(node, writer->world->rdf_nil)) { return sink("()", 2, writer) == 2; } else if (has_scheme && supports_abbrev(writer) && - !(writer->flags & SERD_STYLE_UNQUALIFIED) && + !(writer->flags & SERD_WRITE_UNQUALIFIED) && serd_env_qualify_in_place(writer->env, node, &prefix, &suffix) && is_name(serd_node_string(prefix), serd_node_length(prefix)) && is_name(suffix.buf, suffix.len)) { @@ -580,7 +580,7 @@ write_uri_node(SerdWriter* const writer, } sink("<", 1, writer); - if (!(writer->flags & SERD_STYLE_UNRESOLVED) && + if (!(writer->flags & SERD_WRITE_UNRESOLVED) && serd_env_base_uri(writer->env)) { const SerdURI* base_uri = serd_env_get_parsed_base_uri(writer->env); SerdURI uri; |