From 776a198a686b4eeb824dc520ed12f169ac7e1e65 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Fri, 13 Aug 2021 17:07:23 -0400 Subject: Remove SERD_NO_INLINE_OBJECTS This seems like pointless complexity now, since it's easy to just write simply ordered statements yourself. --- src/describe.c | 27 ++++++++------------------- 1 file changed, 8 insertions(+), 19 deletions(-) (limited to 'src/describe.c') diff --git a/src/describe.c b/src/describe.c index 9328f261..4a087222 100644 --- a/src/describe.c +++ b/src/describe.c @@ -289,31 +289,20 @@ serd_describe_range(const SerdCursor* const range, const SerdSink* sink, const SerdDescribeFlags flags) { - assert(sink); - - SerdStatus st = SERD_SUCCESS; - if (serd_cursor_is_end(range)) { - return st; + return SERD_SUCCESS; } - SerdCursor copy = *range; + assert(sink); - if (flags & SERD_NO_INLINE_OBJECTS) { - const SerdStatement* statement = NULL; - while (!st && (statement = serd_cursor_get(©))) { - if (!(st = serd_sink_write_statement(sink, 0, statement))) { - st = serd_cursor_advance(©); - } - } - } else { - DescribeContext ctx = { - range->model, sink, zix_hash_new(identity, ptr_hash, ptr_equals), flags}; + SerdStatus st = SERD_SUCCESS; + SerdCursor copy = *range; + ZixHash* const list_subjects = zix_hash_new(identity, ptr_hash, ptr_equals); + DescribeContext ctx = {range->model, sink, list_subjects, flags}; - st = write_pretty_range(&ctx, 0, ©, NULL, (flags & SERD_NO_TYPE_FIRST)); + st = write_pretty_range(&ctx, 0, ©, NULL, (flags & SERD_NO_TYPE_FIRST)); - zix_hash_free(ctx.list_subjects); - } + zix_hash_free(list_subjects); return st; } -- cgit v1.2.1