From bcb1158dce040f73aef636f0a61e7ca63988711c Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 29 Mar 2026 23:40:11 +0200 Subject: MISMATCHED_PKL_ANNOTATION_TEXT_WITH_CPL: note -> pkl_id. --- src/verify.cc | 4 ++-- src/verify.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/verify.cc b/src/verify.cc index e3113280..4e40cfa5 100644 --- a/src/verify.cc +++ b/src/verify.cc @@ -1630,7 +1630,7 @@ verify_cpl(Context& context, shared_ptr cpl) } if (required_annotation_text && i->annotation_text() != required_annotation_text) { - context.add_note(VerificationNote::Code::MISMATCHED_PKL_ANNOTATION_TEXT_WITH_CPL, i->id(), i->file().get()); + context.add_note(VerificationNote(VerificationNote::Code::MISMATCHED_PKL_ANNOTATION_TEXT_WITH_CPL, i->file().get()).set_pkl_id(i->id())); } else { context.add_note(VerificationNote::Code::MATCHING_PKL_ANNOTATION_TEXT_WITH_CPL); } @@ -2108,7 +2108,7 @@ dcp::note_to_string(VerificationNote note, function process_str case VerificationNote::Code::UNSIGNED_PKL_WITH_ENCRYPTED_CONTENT: return compose("The PKL %1, which has encrypted content, is not signed.", *note.pkl_id()); case VerificationNote::Code::MISMATCHED_PKL_ANNOTATION_TEXT_WITH_CPL: - return compose("The PKL %1 has only one CPL but its does not match the CPL's .", note.note().get()); + return compose("The PKL %1 has only one CPL but its does not match the CPL's .", *note.pkl_id()); case VerificationNote::Code::MATCHING_PKL_ANNOTATION_TEXT_WITH_CPL: return process_string("The PKL and CPL annotation texts match."); case VerificationNote::Code::ALL_ENCRYPTED: diff --git a/src/verify.h b/src/verify.h index 793adf7f..58069feb 100644 --- a/src/verify.h +++ b/src/verify.h @@ -387,7 +387,7 @@ public: */ UNSIGNED_PKL_WITH_ENCRYPTED_CONTENT, /** If a PKL has one CPL its __ must be the same as the PKL's __ - * note contains the PKL ID + * pkl_id contains the PKL ID * file contains the PKL filename */ MISMATCHED_PKL_ANNOTATION_TEXT_WITH_CPL, -- cgit v1.2.3