aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2018-06-19 09:39:48 -0400
committerDavid Robillard <d@drobilla.net>2019-12-19 20:55:27 -0500
commit2b8e55f6f1e25398f3d0189ff5917252d9c9be68 (patch)
treeac7195a4f28a9923981649a40efe0704e9dba40a
parent13eb1a4deb05c902edd4f4b7f631abb208052dd1 (diff)
downloadserd-2b8e55f6f1e25398f3d0189ff5917252d9c9be68.tar.gz
serd-2b8e55f6f1e25398f3d0189ff5917252d9c9be68.tar.bz2
serd-2b8e55f6f1e25398f3d0189ff5917252d9c9be68.zip
Separate style enum from style flags types
-rw-r--r--serd/serd.h7
-rw-r--r--src/serdi.c4
-rw-r--r--src/writer.c2
-rw-r--r--tests/serd_test.c4
4 files changed, 11 insertions, 6 deletions
diff --git a/serd/serd.h b/serd/serd.h
index bca6c857..965496d8 100644
--- a/serd/serd.h
+++ b/serd/serd.h
@@ -304,6 +304,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
@@ -1205,7 +1210,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 5140dd58..28c4749e 100644
--- a/src/serdi.c
+++ b/src/serdi.c
@@ -206,7 +206,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) {
@@ -228,7 +228,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 35fe1937..4b3387c3 100644
--- a/src/writer.c
+++ b/src/writer.c
@@ -862,7 +862,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 6f5397da..1dd73b4a 100644
--- a/tests/serd_test.c
+++ b/tests/serd_test.c
@@ -623,7 +623,7 @@ test_writer(const char* const path)
SerdWriter* writer = serd_writer_new(world,
SERD_TURTLE,
- (SerdStyle)0,
+ 0,
env,
(SerdWriteFunc)fwrite,
fd);
@@ -706,7 +706,7 @@ test_writer(const char* const path)
// 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));