diff options
| author | David Robillard <d@drobilla.net> | 2018-06-19 09:39:48 -0400 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2018-12-31 11:37:48 -0500 |
| commit | d6936bcc76d8a4459fbdc7b2b2e1fba252759587 (patch) | |
| tree | 0f4b4bb314875fa248a3e1ef45593d83f16ea0cf | |
| parent | 901626455b80f63b6e0dc4ca45ac0a0319364c77 (diff) | |
| download | serd-d6936bcc76d8a4459fbdc7b2b2e1fba252759587.tar.gz serd-d6936bcc76d8a4459fbdc7b2b2e1fba252759587.tar.bz2 serd-d6936bcc76d8a4459fbdc7b2b2e1fba252759587.zip | |
Separate style enum from style flags types
| -rw-r--r-- | serd/serd.h | 7 | ||||
| -rw-r--r-- | src/serdi.c | 4 | ||||
| -rw-r--r-- | src/writer.c | 2 | ||||
| -rw-r--r-- | tests/serd_test.c | 4 |
4 files changed, 11 insertions, 6 deletions
diff --git a/serd/serd.h b/serd/serd.h index a2645343..f4391f4e 100644 --- a/serd/serd.h +++ b/serd/serd.h @@ -311,6 +311,11 @@ typedef enum { } SerdStyle; /** + Bitwise OR of SerdStyle values. +*/ +typedef uint32_t SerdStyleFlags; + +/** Free memory allocated by Serd. This function exists because some systems require memory allocated by a @@ -1164,7 +1169,7 @@ SERD_API SerdWriter* serd_writer_new(SerdWorld* world, SerdSyntax syntax, - SerdStyle style, + SerdStyleFlags style, SerdEnv* env, SerdWriteFunc ssink, void* stream); diff --git a/src/serdi.c b/src/serdi.c index 204d381a..dbc57a6c 100644 --- a/src/serdi.c +++ b/src/serdi.c @@ -197,7 +197,7 @@ main(int argc, char** argv) SerdWorld* world = serd_world_new(); SerdEnv* env = serd_env_new(base); - int output_style = 0; + SerdStyleFlags output_style = 0; if (output_syntax == SERD_NTRIPLES || ascii) { output_style |= SERD_STYLE_ASCII; } else if (output_syntax == SERD_TURTLE) { @@ -219,7 +219,7 @@ main(int argc, char** argv) SerdWriter* writer = serd_writer_new(world, output_syntax, - (SerdStyle)output_style, + output_style, env, (SerdWriteFunc)fwrite, out_fd); diff --git a/src/writer.c b/src/writer.c index c11920eb..d3904143 100644 --- a/src/writer.c +++ b/src/writer.c @@ -865,7 +865,7 @@ serd_writer_finish(SerdWriter* writer) SerdWriter* serd_writer_new(SerdWorld* world, SerdSyntax syntax, - SerdStyle style, + SerdStyleFlags style, SerdEnv* env, SerdWriteFunc ssink, void* stream) diff --git a/tests/serd_test.c b/tests/serd_test.c index efc59aef..1ddb2dd8 100644 --- a/tests/serd_test.c +++ b/tests/serd_test.c @@ -472,7 +472,7 @@ main(void) SerdWriter* writer = serd_writer_new(world, SERD_TURTLE, - (SerdStyle)0, + 0, env, (SerdWriteFunc)fwrite, fd); @@ -553,7 +553,7 @@ main(void) // Test buffer sink SerdBuffer buffer = { NULL, 0 }; writer = serd_writer_new( - world, SERD_TURTLE, (SerdStyle)0, env, serd_buffer_sink, &buffer); + world, SERD_TURTLE, 0, env, serd_buffer_sink, &buffer); o = serd_new_uri("http://example.org/base"); assert(!serd_writer_set_base_uri(writer, o)); |