Skip to content

Commit b931e0a

Browse files
committed
cborparser: Move the reader context to CborParser.
1 parent 5f00f7e commit b931e0a

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

src/cborparser.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,7 @@ CborError cbor_parser_init_reader(const struct CborParserOperations *ops, CborPa
381381
cbor_parser_init_common(parser, it);
382382
parser->ops = ops;
383383
parser->flags = CborParserFlag_ExternalSource;
384-
it->source.token = token;
384+
parser->data.ctx = token;
385385
return preparse_value(it);
386386
}
387387

tests/parser/tst_parser.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -766,20 +766,20 @@ struct Input {
766766

767767
static const CborParserOperations byteArrayOps = {
768768
/* can_read_bytes = */ [](const CborValue *value, size_t len) {
769-
auto input = static_cast<Input *>(value->source.token);
769+
auto input = static_cast<Input *>(value->parser->data.ctx);
770770
return input->data.size() - input->consumed >= int(len);
771771
},
772772
/* read_bytes = */ [](const CborValue *value, void *dst, size_t offset, size_t len) {
773-
auto input = static_cast<Input *>(value->source.token);
773+
auto input = static_cast<Input *>(value->parser->data.ctx);
774774
return memcpy(dst, input->data.constData() + input->consumed + offset, len);
775775
},
776776
/* advance_bytes = */ [](CborValue *value, size_t len) {
777-
auto input = static_cast<Input *>(value->source.token);
777+
auto input = static_cast<Input *>(value->parser->data.ctx);
778778
input->consumed += int(len);
779779
},
780780
/* transfer_string = */ [](CborValue *value, const void **userptr, size_t offset, size_t len) {
781781
// ###
782-
auto input = static_cast<Input *>(value->source.token);
782+
auto input = static_cast<Input *>(value->parser->data.ctx);
783783
if (input->data.size() - input->consumed < int(len + offset))
784784
return CborErrorUnexpectedEOF;
785785
input->consumed += int(offset);

0 commit comments

Comments
 (0)