Commit fbfbccd5 authored by Kenton Varda's avatar Kenton Varda

Merge pull request #76 from dwrensha/readeroptions

fix some error messages
parents 00c5f916 8df5d72c
...@@ -1658,7 +1658,7 @@ struct WireHelpers { ...@@ -1658,7 +1658,7 @@ struct WireHelpers {
switch (src->kind()) { switch (src->kind()) {
case WirePointer::STRUCT: case WirePointer::STRUCT:
KJ_REQUIRE(nestingLimit > 0, KJ_REQUIRE(nestingLimit > 0,
"Message is too deeply-nested or contains cycles. See capnp::ReadOptions.") { "Message is too deeply-nested or contains cycles. See capnp::ReaderOptions.") {
goto useDefault; goto useDefault;
} }
...@@ -1678,7 +1678,7 @@ struct WireHelpers { ...@@ -1678,7 +1678,7 @@ struct WireHelpers {
FieldSize elementSize = src->listRef.elementSize(); FieldSize elementSize = src->listRef.elementSize();
KJ_REQUIRE(nestingLimit > 0, KJ_REQUIRE(nestingLimit > 0,
"Message is too deeply-nested or contains cycles. See capnp::ReadOptions.") { "Message is too deeply-nested or contains cycles. See capnp::ReaderOptions.") {
goto useDefault; goto useDefault;
} }
...@@ -1826,7 +1826,7 @@ struct WireHelpers { ...@@ -1826,7 +1826,7 @@ struct WireHelpers {
} }
KJ_REQUIRE(nestingLimit > 0, KJ_REQUIRE(nestingLimit > 0,
"Message is too deeply-nested or contains cycles. See capnp::ReadOptions.") { "Message is too deeply-nested or contains cycles. See capnp::ReaderOptions.") {
goto useDefault; goto useDefault;
} }
...@@ -1904,7 +1904,7 @@ struct WireHelpers { ...@@ -1904,7 +1904,7 @@ struct WireHelpers {
} }
KJ_REQUIRE(nestingLimit > 0, KJ_REQUIRE(nestingLimit > 0,
"Message is too deeply-nested or contains cycles. See capnp::ReadOptions.") { "Message is too deeply-nested or contains cycles. See capnp::ReaderOptions.") {
goto useDefault; goto useDefault;
} }
...@@ -2492,7 +2492,7 @@ Data::Reader ListReader::asData() { ...@@ -2492,7 +2492,7 @@ Data::Reader ListReader::asData() {
StructReader ListReader::getStructElement(ElementCount index) const { StructReader ListReader::getStructElement(ElementCount index) const {
KJ_REQUIRE(nestingLimit > 0, KJ_REQUIRE(nestingLimit > 0,
"Message is too deeply-nested or contains cycles. See capnp::ReadOptions.") { "Message is too deeply-nested or contains cycles. See capnp::ReaderOptions.") {
return StructReader(); return StructReader();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment