From 65ab67312b70523095c4ed9b1a4596df50d8d0fd Mon Sep 17 00:00:00 2001 From: Chih-Hung Hsieh Date: Wed, 12 Dec 2018 14:13:48 -0800 Subject: Fix performance-for-range-copy warnings Bug: 30413223 Test: make with WITH_TIDY=1 DEFAULT_GLOBAL_TIDY_CHECKS=-*,performance* Change-Id: I1b76a22eab100a31e77048626e48169fe7eeaf92 --- drm/1.0/vts/functional/drm_hal_vendor_test.cpp | 32 ++++++++++++------------ drm/1.1/vts/functional/drm_hal_clearkey_test.cpp | 4 +-- 2 files changed, 18 insertions(+), 18 deletions(-) (limited to 'drm') diff --git a/drm/1.0/vts/functional/drm_hal_vendor_test.cpp b/drm/1.0/vts/functional/drm_hal_vendor_test.cpp index d03b2af37..20a2ca4af 100644 --- a/drm/1.0/vts/functional/drm_hal_vendor_test.cpp +++ b/drm/1.0/vts/functional/drm_hal_vendor_test.cpp @@ -177,7 +177,7 @@ class DrmHalVendorFactoryTest : public testing::TestWithParam { TEST_P(DrmHalVendorFactoryTest, ValidateConfigurations) { const char* kVendorStr = "Vendor module "; size_t count = 0; - for (auto config : contentConfigurations) { + for (const auto& config : contentConfigurations) { ASSERT_TRUE(config.name.size() > 0) << kVendorStr << "has no name"; ASSERT_TRUE(config.serverUrl.size() > 0) << kVendorStr << "has no serverUrl"; @@ -186,7 +186,7 @@ TEST_P(DrmHalVendorFactoryTest, ValidateConfigurations) { ASSERT_TRUE(config.mimeType.size() > 0) << kVendorStr << "has no mime type"; ASSERT_TRUE(config.keys.size() >= 1) << kVendorStr << "has no keys"; - for (auto key : config.keys) { + for (const auto& key : config.keys) { ASSERT_TRUE(key.keyId.size() > 0) << kVendorStr << " has zero length keyId"; ASSERT_TRUE(key.keyId.size() > 0) << kVendorStr @@ -245,7 +245,7 @@ TEST_P(DrmHalVendorFactoryTest, InvalidContentTypeNotSupported) { */ TEST_P(DrmHalVendorFactoryTest, ValidContentTypeSupported) { RETURN_IF_SKIPPED; - for (auto config : contentConfigurations) { + for (const auto& config : contentConfigurations) { EXPECT_TRUE(drmFactory->isContentTypeSupported(config.mimeType)); } } @@ -610,7 +610,7 @@ TEST_P(DrmHalVendorPluginTest, RemoveKeysNewSession) { */ TEST_P(DrmHalVendorPluginTest, RestoreKeys) { RETURN_IF_SKIPPED; - for (auto config : contentConfigurations) { + for (const auto& config : contentConfigurations) { if (config.policy.allowOffline) { auto sessionId = openSession(); hidl_vec keySetId = @@ -645,7 +645,7 @@ TEST_P(DrmHalVendorPluginTest, RestoreKeysNull) { */ TEST_P(DrmHalVendorPluginTest, RestoreKeysClosedSession) { RETURN_IF_SKIPPED; - for (auto config : contentConfigurations) { + for (const auto& config : contentConfigurations) { if (config.policy.allowOffline) { auto sessionId = openSession(); hidl_vec keySetId = @@ -1022,8 +1022,8 @@ TEST_P(DrmHalVendorPluginTest, RequiresSecureDecoderInvalidMimeType) { */ TEST_P(DrmHalVendorPluginTest, RequiresSecureDecoderConfig) { RETURN_IF_SKIPPED; - for (auto config : contentConfigurations) { - for (auto key : config.keys) { + for (const auto& config : contentConfigurations) { + for (const auto& key : config.keys) { if (key.isSecure) { EXPECT_TRUE(cryptoPlugin->requiresSecureDecoderComponent(config.mimeType)); break; @@ -1471,7 +1471,7 @@ TEST_P(DrmHalVendorDecryptTest, QueryKeyStatusWithNoKeys) { */ TEST_P(DrmHalVendorDecryptTest, QueryKeyStatus) { RETURN_IF_SKIPPED; - for (auto config : contentConfigurations) { + for (const auto& config : contentConfigurations) { auto sessionId = openSession(); loadKeys(sessionId, config); auto keyStatus = queryKeyStatus(sessionId); @@ -1485,8 +1485,8 @@ TEST_P(DrmHalVendorDecryptTest, QueryKeyStatus) { */ TEST_P(DrmHalVendorDecryptTest, ClearSegmentTest) { RETURN_IF_SKIPPED; - for (auto config : contentConfigurations) { - for (auto key : config.keys) { + for (const auto& config : contentConfigurations) { + for (const auto& key : config.keys) { const size_t kSegmentSize = 1024; vector iv(AES_BLOCK_SIZE, 0); const Pattern noPattern = {0, 0}; @@ -1513,8 +1513,8 @@ TEST_P(DrmHalVendorDecryptTest, ClearSegmentTest) { */ TEST_P(DrmHalVendorDecryptTest, EncryptedAesCtrSegmentTest) { RETURN_IF_SKIPPED; - for (auto config : contentConfigurations) { - for (auto key : config.keys) { + for (const auto& config : contentConfigurations) { + for (const auto& key : config.keys) { const size_t kSegmentSize = 1024; vector iv(AES_BLOCK_SIZE, 0); const Pattern noPattern = {0, 0}; @@ -1540,8 +1540,8 @@ TEST_P(DrmHalVendorDecryptTest, EncryptedAesCtrSegmentTest) { */ TEST_P(DrmHalVendorDecryptTest, EncryptedAesCtrSegmentTestNoKeys) { RETURN_IF_SKIPPED; - for (auto config : contentConfigurations) { - for (auto key : config.keys) { + for (const auto& config : contentConfigurations) { + for (const auto& key : config.keys) { vector iv(AES_BLOCK_SIZE, 0); const Pattern noPattern = {0, 0}; const vector subSamples = {{.numBytesOfClearData = 256, @@ -1567,8 +1567,8 @@ TEST_P(DrmHalVendorDecryptTest, EncryptedAesCtrSegmentTestNoKeys) { */ TEST_P(DrmHalVendorDecryptTest, AttemptDecryptWithKeysRemoved) { RETURN_IF_SKIPPED; - for (auto config : contentConfigurations) { - for (auto key : config.keys) { + for (const auto& config : contentConfigurations) { + for (const auto& key : config.keys) { vector iv(AES_BLOCK_SIZE, 0); const Pattern noPattern = {0, 0}; const vector subSamples = {{.numBytesOfClearData = 256, diff --git a/drm/1.1/vts/functional/drm_hal_clearkey_test.cpp b/drm/1.1/vts/functional/drm_hal_clearkey_test.cpp index 124661696..7dedd7f0b 100644 --- a/drm/1.1/vts/functional/drm_hal_clearkey_test.cpp +++ b/drm/1.1/vts/functional/drm_hal_clearkey_test.cpp @@ -228,13 +228,13 @@ protected: const std::string& componentName, const VT& componentValue) { bool validAttribute = false; bool validComponent = false; - for (DrmMetricGroup::Attribute attribute : metric.attributes) { + for (const DrmMetricGroup::Attribute& attribute : metric.attributes) { if (attribute.name == attributeName && ValueEquals(attribute.type, attributeValue, attribute)) { validAttribute = true; } } - for (DrmMetricGroup::Value value : metric.values) { + for (const DrmMetricGroup::Value& value : metric.values) { if (value.componentName == componentName && ValueEquals(value.type, componentValue, value)) { validComponent = true; -- cgit v1.2.3