summaryrefslogtreecommitdiff
path: root/src/verify.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2023-01-01 21:27:16 +0100
committerCarl Hetherington <cth@carlh.net>2023-01-07 22:46:32 +0100
commitcb574824a2e5d280b421e8c4e81fa90b85b877ae (patch)
tree15e91a4e95d18ad506e6ef5f591633581170ecf0 /src/verify.cc
parent05e0890d4bb991fc321ac2e11993eba37d20e077 (diff)
Cleanup: rename AssetMap::path -> file for consistency.
Diffstat (limited to 'src/verify.cc')
-rw-r--r--src/verify.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/verify.cc b/src/verify.cc
index c8009741..bfa697da 100644
--- a/src/verify.cc
+++ b/src/verify.cc
@@ -1649,12 +1649,12 @@ verify_assetmap(
auto asset_map = dcp->asset_map();
DCP_ASSERT(asset_map);
- validate_xml(asset_map->path().get(), xsd_dtd_directory, notes);
+ validate_xml(asset_map->file().get(), xsd_dtd_directory, notes);
set<string> uuid_set;
for (auto const& asset: asset_map->assets()) {
if (!uuid_set.insert(asset.id()).second) {
- notes.push_back({VerificationNote::Type::ERROR, VerificationNote::Code::DUPLICATE_ASSET_ID_IN_ASSETMAP, asset_map->id(), asset_map->path().get()});
+ notes.push_back({VerificationNote::Type::ERROR, VerificationNote::Code::DUPLICATE_ASSET_ID_IN_ASSETMAP, asset_map->id(), asset_map->file().get()});
break;
}
}
@@ -1725,8 +1725,8 @@ dcp::verify (
verify_pkl(dcp, pkl, *xsd_dtd_directory, notes);
}
- if (dcp->asset_map_path()) {
- stage ("Checking ASSETMAP", dcp->asset_map_path().get());
+ if (dcp->asset_map_file()) {
+ stage("Checking ASSETMAP", dcp->asset_map_file().get());
verify_assetmap(dcp, *xsd_dtd_directory, notes);
} else {
notes.push_back ({VerificationNote::Type::ERROR, VerificationNote::Code::MISSING_ASSETMAP});