diff options
| author | Shawn Willden <swillden@google.com> | 2020-11-24 22:08:42 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-24 22:08:42 +0000 |
| commit | 0392fb1ab10d1453440bd907d30facbdf32279d9 (patch) | |
| tree | 7a462a7b6813b3b048363146ddebcf51d1e7c029 | |
| parent | de874a1153ad594cb2bf77025c8212c28bbe3d13 (diff) | |
| parent | 97a714291d3df5b03e238617602e485b71970655 (diff) | |
| download | libcppbor-0392fb1ab10d1453440bd907d30facbdf32279d9.tar.gz | |
Fix Trusty breakage. am: def2ca0f35 am: 97a714291d
Original change: https://android-review.googlesource.com/c/platform/external/libcppbor/+/1510449
Change-Id: I5f1d923295ad123260c9c5270c0a2e8cabcee4ba
| -rw-r--r-- | src/cppbor.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/cppbor.cpp b/src/cppbor.cpp index 7cd0f30..e644840 100644 --- a/src/cppbor.cpp +++ b/src/cppbor.cpp @@ -224,7 +224,9 @@ bool prettyPrintInternal(const Item* item, string& out, size_t indent, size_t ma } else if (asNull != nullptr) { out.append("null"); } else { +#ifndef __TRUSTY__ LOG(ERROR) << "Only boolean/null is implemented for SIMPLE"; +#endif // __TRUSTY__ return false; } break; @@ -470,7 +472,9 @@ string prettyPrint(const vector<uint8_t>& encodedCbor, size_t maxBStrSize, const vector<string>& mapKeysToNotPrint) { auto [item, _, message] = parse(encodedCbor); if (item == nullptr) { +#ifndef __TRUSTY__ LOG(ERROR) << "Data to pretty print is not valid CBOR: " << message; +#endif // __TRUSTY__ return ""; } |