diff options
-rw-r--r-- | src/n3.c | 11 | ||||
-rw-r--r-- | src/reader.c | 6 | ||||
-rw-r--r-- | src/reader.h | 6 |
3 files changed, 7 insertions, 16 deletions
@@ -962,7 +962,7 @@ read_anon(SerdReader* reader, ReadContext ctx, bool subject, SerdNode** dest) *dest = blank_id(reader); } if (ctx.subject) { - TRY_RET(emit_statement(reader, ctx, *dest, 0, 0)); + TRY_RET(emit_statement(reader, ctx, *dest)); } ctx.subject = *dest; @@ -1064,7 +1064,7 @@ read_object(SerdReader* reader, ReadContext* ctx, bool emit, bool* ate_dot) } if (ret && emit && simple) { - ret = emit_statement(reader, *ctx, o, datatype, lang); + ret = emit_statement(reader, *ctx, o); } else if (ret && !emit) { ctx->object = o; ctx->datatype = datatype; @@ -1153,7 +1153,7 @@ read_collection(SerdReader* reader, ReadContext ctx, SerdNode** dest) if (ctx.subject) { // subject predicate _:head *ctx.flags |= (end ? 0 : SERD_LIST_O_BEGIN); - TRY_RET(emit_statement(reader, ctx, *dest, 0, 0)); + TRY_RET(emit_statement(reader, ctx, *dest)); *ctx.flags |= SERD_LIST_CONT; } else { *ctx.flags |= (end ? 0 : SERD_LIST_S_BEGIN); @@ -1196,8 +1196,7 @@ read_collection(SerdReader* reader, ReadContext ctx, SerdNode** dest) // _:node rdf:rest _:rest *ctx.flags |= SERD_LIST_CONT; ctx.predicate = reader->rdf_rest; - TRY_RET(emit_statement(reader, ctx, - (end ? reader->rdf_nil : rest), 0, 0)); + TRY_RET(emit_statement(reader, ctx, (end ? reader->rdf_nil : rest))); ctx.subject = rest; // _:node = _:rest rest = node; // _:rest = (old)_:node @@ -1531,7 +1530,7 @@ read_nquadsDoc(SerdReader* reader) eat_byte_check(reader, '.'); } - if (!emit_statement(reader, ctx, ctx.object, ctx.datatype, ctx.lang)) { + if (!emit_statement(reader, ctx, ctx.object)) { break; } diff --git a/src/reader.c b/src/reader.c index 5034d489..60f89a5b 100644 --- a/src/reader.c +++ b/src/reader.c @@ -109,11 +109,7 @@ push_node(SerdReader* reader, SerdType type, const char* str, size_t n_bytes) } bool -emit_statement(SerdReader* reader, - ReadContext ctx, - SerdNode* o, - SerdNode* d, - SerdNode* l) +emit_statement(SerdReader* reader, ReadContext ctx, SerdNode* o) { SerdNode* graph = ctx.graph; if (!graph && reader->default_graph) { diff --git a/src/reader.h b/src/reader.h index 0019086c..234413a0 100644 --- a/src/reader.h +++ b/src/reader.h @@ -87,11 +87,7 @@ size_t genid_size(SerdReader* reader); SerdNode* blank_id(SerdReader* reader); void set_blank_id(SerdReader* reader, SerdNode* node, size_t buf_size); -bool emit_statement(SerdReader* reader, - ReadContext ctx, - SerdNode* o, - SerdNode* d, - SerdNode* l); +bool emit_statement(SerdReader* reader, ReadContext ctx, SerdNode* o); bool read_n3_statement(SerdReader* reader); SerdStatus read_nquadsDoc(SerdReader* reader); |