libvintf: use toFQNameString
Centralize the hard-coded "@" "::" "/".
Test: builds
Test: libvintf_test
Test: vintf_object_test
Change-Id: I1942441865585b11801e7d9b38c0c57b5c5ebe17
diff --git a/VintfObject.cpp b/VintfObject.cpp
index e89ca56..c66011b 100644
--- a/VintfObject.cpp
+++ b/VintfObject.cpp
@@ -597,7 +597,7 @@
targetMatrix.getHalWithMajorVersion(package, version.majorVer);
if (targetMatrixHal == nullptr || targetMatrixRange == nullptr) {
if (error) {
- *error = package + "@" + to_string(servedVersion) +
+ *error = toFQNameString(package, servedVersion) +
"is deprecated in compatibility matrix at FCM Version " +
to_string(targetMatrix.level()) + "; it should not be served.";
}
@@ -607,9 +607,9 @@
const auto& targetMatrixInstances = targetMatrixHal->getInstances(interface);
if (targetMatrixInstances.find(instance) == targetMatrixInstances.end()) {
if (error) {
- *error += package + "@" + to_string(servedVersion) + "::" + interface + "/" +
- instance + " is deprecated at FCM version " +
- to_string(targetMatrix.level()) + "; it should be not be served.\n";
+ *error += toFQNameString(package, servedVersion, interface, instance) +
+ " is deprecated at FCM version " + to_string(targetMatrix.level()) +
+ "; it should be not be served.\n";
}
return true;
}
@@ -621,7 +621,7 @@
if (!targetVersionServed) {
if (error) {
- *error += package + "@" + to_string(servedVersion) + " is deprecated; " +
+ *error += toFQNameString(package, servedVersion) + " is deprecated; " +
"require at least " + to_string(targetMatrixRange->minVer()) + "\n";
}
return true;