Skip to content

Commit 8d699d3

Browse files
committed
WSHUB-458: cborparser: Move the reader context to CborParser.
1 parent 6f0056e commit 8d699d3

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
@@ -382,7 +382,7 @@ CborError cbor_parser_init_reader(const struct CborParserOperations *ops, CborPa
382382
cbor_parser_init_common(parser, it);
383383
parser->ops = ops;
384384
parser->flags = CborParserFlag_ExternalSource;
385-
it->source.token = token;
385+
parser->data.ctx = token;
386386
return preparse_value(it);
387387
}
388388

tests/parser/tst_parser.cpp

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

765765
static const CborParserOperations byteArrayOps = {
766766
/* can_read_bytes = */ [](const CborValue *value, size_t len) {
767-
auto input = static_cast<Input *>(value->source.token);
767+
auto input = static_cast<Input *>(value->parser->data.ctx);
768768
return input->data.size() - input->consumed >= int(len);
769769
},
770770
/* read_bytes = */ [](const CborValue *value, void *dst, size_t offset, size_t len) {
771-
auto input = static_cast<Input *>(value->source.token);
771+
auto input = static_cast<Input *>(value->parser->data.ctx);
772772
return memcpy(dst, input->data.constData() + input->consumed + offset, len);
773773
},
774774
/* advance_bytes = */ [](CborValue *value, size_t len) {
775-
auto input = static_cast<Input *>(value->source.token);
775+
auto input = static_cast<Input *>(value->parser->data.ctx);
776776
input->consumed += int(len);
777777
},
778778
/* transfer_string = */ [](CborValue *value, const void **userptr, size_t offset, size_t len) {
779779
// ###
780-
auto input = static_cast<Input *>(value->source.token);
780+
auto input = static_cast<Input *>(value->parser->data.ctx);
781781
if (input->data.size() - input->consumed < int(len + offset))
782782
return CborErrorUnexpectedEOF;
783783
input->consumed += int(offset);

0 commit comments

Comments
 (0)