summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2022-03-14 21:24:13 -0400
committerDavid Robillard <d@drobilla.net>2022-03-14 21:24:13 -0400
commit633b7c8a3f12461c032ee2da297a62958defc19a (patch)
treed6efa40de2a9553d032298bff582aeb02bc27e8d
parent7df6ee7e742a57b35f9c82c150225da5be48a307 (diff)
downloadsratom-633b7c8a3f12461c032ee2da297a62958defc19a.tar.gz
sratom-633b7c8a3f12461c032ee2da297a62958defc19a.tar.bz2
sratom-633b7c8a3f12461c032ee2da297a62958defc19a.zip
fixup! port to serd1serd1
-rw-r--r--src/dumper.c7
-rw-r--r--src/loader.c6
-rw-r--r--test/test_sratom.c1
3 files changed, 6 insertions, 8 deletions
diff --git a/src/dumper.c b/src/dumper.c
index 73a667e..eecbf0e 100644
--- a/src/dumper.c
+++ b/src/dumper.c
@@ -323,10 +323,7 @@ write_atom(StreamContext* const ctx,
const size_t len = 2 * size;
char* const str = (char*)calloc(len + 1, 1);
for (uint32_t i = 0; i < size; ++i) {
- snprintf(str + (2 * i),
- 3,
- "%02X",
- (unsigned)*((const uint8_t*)body + i));
+ snprintf(str + (2 * i), 3, "%02X", (unsigned)*((const uint8_t*)body + i));
}
object =
@@ -364,7 +361,7 @@ write_atom(StreamContext* const ctx,
ctx->sflags |= SERD_LIST_O | SERD_TERSE_O;
LV2_ATOM_TUPLE_BODY_FOREACH (body, size, i) {
if (!is_primitive_type(ctx, i->type)) {
- ctx->sflags &= ~SERD_TERSE_O;
+ ctx->sflags &= ~(SerdStatementFlags)SERD_TERSE_O;
}
}
diff --git a/src/loader.c b/src/loader.c
index eead3a2..b0cfc4e 100644
--- a/src/loader.c
+++ b/src/loader.c
@@ -60,9 +60,9 @@ struct SratomLoaderImpl {
};
typedef struct {
- SratomLoader* SERD_NONNULL loader;
- const SerdNode* SERD_NONNULL base_uri;
- LV2_URID seq_unit;
+ SratomLoader* SERD_NONNULL loader;
+ const SerdNode* SERD_NULLABLE base_uri;
+ LV2_URID seq_unit;
} LoadContext;
static SratomStatus
diff --git a/test/test_sratom.c b/test/test_sratom.c
index 703befb..7e4159c 100644
--- a/test/test_sratom.c
+++ b/test/test_sratom.c
@@ -342,6 +342,7 @@ main(void)
test(env, "Pretty + Terse", SRATOM_PRETTY_NUMBERS | SRATOM_TERSE));
serd_env_free(env);
+ serd_world_free(world);
return st;
}