From ef0ec145d31120874ccd76af4c83ecc86c6f398d Mon Sep 17 00:00:00 2001 From: Fred Gylys-Colwell Date: Wed, 14 Feb 2018 17:16:15 -0800 Subject: [PATCH] Fix compiler warnings Merge from Widevine repo of http://go/wvgerrit/43420 Remove or mark unused variables. Fix unsigned/signed comparisons. bug: 73390805 test: unit tests Change-Id: Ic523400a5decf82fae733042b260e0c39a087cd3 --- .../cdm/core/include/sublicense_key_session.h | 4 ++-- libwvdrmengine/cdm/core/src/cdm_engine.cpp | 2 +- libwvdrmengine/cdm/core/src/crypto_session.cpp | 2 +- .../cdm/core/src/oemcrypto_adapter_dynamic.cpp | 6 +++--- libwvdrmengine/cdm/src/log.cpp | 2 +- .../cdm/test/cdm_extended_duration_test.cpp | 15 +++------------ libwvdrmengine/cdm/test/cdm_feature_test.cpp | 7 +++---- libwvdrmengine/cdm/test/request_license_test.cpp | 2 -- libwvdrmengine/level3/arm/Android.mk | 3 ++- libwvdrmengine/level3/arm64/Android.mk | 3 ++- libwvdrmengine/level3/mips/Android.mk | 3 ++- libwvdrmengine/level3/mips64/Android.mk | 3 ++- libwvdrmengine/level3/x86/Android.mk | 3 ++- libwvdrmengine/level3/x86_64/Android.mk | 3 ++- .../mediacrypto/test/WVCryptoPlugin_test.cpp | 3 --- libwvdrmengine/mediadrm/test/WVDrmPlugin_test.cpp | 5 ----- 16 files changed, 26 insertions(+), 40 deletions(-) diff --git a/libwvdrmengine/cdm/core/include/sublicense_key_session.h b/libwvdrmengine/cdm/core/include/sublicense_key_session.h index 1367882f..f322af72 100644 --- a/libwvdrmengine/cdm/core/include/sublicense_key_session.h +++ b/libwvdrmengine/cdm/core/include/sublicense_key_session.h @@ -43,7 +43,7 @@ class SubLicenseKeySession : public KeySession { CdmCipherMode* cipher_mode, const std::string& srm_requirement); - OEMCryptoResult LoadEntitledContentKeys(const std::vector& keys) { + OEMCryptoResult LoadEntitledContentKeys(const std::vector& /*keys*/) { return OEMCrypto_ERROR_INVALID_CONTEXT; } @@ -92,4 +92,4 @@ class SubLicenseKeySession : public KeySession { } // namespace wvcdm -#endif // WVCDM_CORE_SUBLICENSE_KEY_SESSSION_H_ \ No newline at end of file +#endif // WVCDM_CORE_SUBLICENSE_KEY_SESSSION_H_ diff --git a/libwvdrmengine/cdm/core/src/cdm_engine.cpp b/libwvdrmengine/cdm/core/src/cdm_engine.cpp index ad4640d3..a5d4cfb0 100644 --- a/libwvdrmengine/cdm/core/src/cdm_engine.cpp +++ b/libwvdrmengine/cdm/core/src/cdm_engine.cpp @@ -586,7 +586,7 @@ CdmResponseType CdmEngine::QueryStatus(SecurityLevel security_level, open_sessions_stream << number_of_open_sessions; *query_response = open_sessions_stream.str(); } else if (query_token == QUERY_KEY_MAX_NUMBER_OF_SESSIONS) { - size_t maximum_number_of_sessions; + size_t maximum_number_of_sessions = 0; if (!crypto_session.GetMaxNumberOfSessions(&maximum_number_of_sessions)) { LOGW("CdmEngine::QueryStatus: GetMaxNumberOfOpenSessions failed"); return UNKNOWN_ERROR; diff --git a/libwvdrmengine/cdm/core/src/crypto_session.cpp b/libwvdrmengine/cdm/core/src/crypto_session.cpp index f167a22a..bed24b5e 100644 --- a/libwvdrmengine/cdm/core/src/crypto_session.cpp +++ b/libwvdrmengine/cdm/core/src/crypto_session.cpp @@ -1658,7 +1658,7 @@ bool CryptoSession::GetMaxNumberOfSessions(size_t* max) { return false; } - size_t max_sessions; + size_t max_sessions = 0; OEMCryptoResult status = OEMCrypto_GetMaxNumberOfSessions( requested_security_level_, &max_sessions); if (OEMCrypto_SUCCESS != status) { diff --git a/libwvdrmengine/cdm/core/src/oemcrypto_adapter_dynamic.cpp b/libwvdrmengine/cdm/core/src/oemcrypto_adapter_dynamic.cpp index 5a3b9e98..a40d7683 100644 --- a/libwvdrmengine/cdm/core/src/oemcrypto_adapter_dynamic.cpp +++ b/libwvdrmengine/cdm/core/src/oemcrypto_adapter_dynamic.cpp @@ -759,10 +759,10 @@ class Adapter { OEMCrypto_INITIALIZED_USING_L3_COULD_NOT_OPEN_FACTORY_KEYBOX); return false; } - uint8_t keybox[size]; - ssize_t size_read = file->Read(reinterpret_cast(keybox), size); + std::vector keybox(size); + ssize_t size_read = file->Read(reinterpret_cast(&keybox[0]), size); file->Close(); - if (level1_.InstallKeybox(keybox, size) != OEMCrypto_SUCCESS) { + if (level1_.InstallKeybox(&keybox[0], size_read) != OEMCrypto_SUCCESS) { LOGE("Could NOT install keybox from %s. Falling Back to L3.", filename.c_str()); level1_.Terminate(); diff --git a/libwvdrmengine/cdm/src/log.cpp b/libwvdrmengine/cdm/src/log.cpp index 61daf9d3..5fbfeb59 100644 --- a/libwvdrmengine/cdm/src/log.cpp +++ b/libwvdrmengine/cdm/src/log.cpp @@ -49,7 +49,7 @@ void Log(const char* file, const char* function, int line, LogPriority level, int len = snprintf(buf, LOG_BUF_SIZE, "[%s(%d):%s] ", filename, line, function); if (len < 0) len = 0; - if (len < sizeof(buf)) { + if (static_cast(len) < sizeof(buf)) { va_list ap; va_start(ap, format); vsnprintf(buf+len, LOG_BUF_SIZE-len, format, ap); diff --git a/libwvdrmengine/cdm/test/cdm_extended_duration_test.cpp b/libwvdrmengine/cdm/test/cdm_extended_duration_test.cpp index adf9af0b..01f56d80 100644 --- a/libwvdrmengine/cdm/test/cdm_extended_duration_test.cpp +++ b/libwvdrmengine/cdm/test/cdm_extended_duration_test.cpp @@ -30,12 +30,12 @@ namespace { // HTTP response codes. const int kHttpOk = 200; -const int kHttpBadRequest = 400; -const int kHttpInternalServerError = 500; +// The following two responses are unused, but left here for human debuggers. +// const int kHttpBadRequest = 400; +// const int kHttpInternalServerError = 500; const uint32_t kMinute = 60; const uint32_t kClockTolerance = 10; -const uint32_t kTwoMinutes = 120; const uint32_t kMaxUsageTableSize = 50; @@ -932,7 +932,6 @@ TEST_F(WvCdmExtendedDurationTest, DecryptionCloseSessionConcurrencyTest) { TEST_F(WvCdmExtendedDurationTest, UsageOverflowTest) { Provision(); - SubSampleInfo* data = &kEncryptedStreamingClip5SubSample; TestWvCdmClientPropertySet client_property_set; TestWvCdmClientPropertySet* property_set = NULL; @@ -959,7 +958,6 @@ TEST_F(WvCdmExtendedDurationTest, UsageOverflowTest) { decryptor_.CloseSession(session_id_); } - uint32_t num_usage_info = 0; CdmUsageInfo usage_info; CdmUsageInfoReleaseMessage release_msg; CdmResponseType status = decryptor_.GetUsageInfo( @@ -1003,9 +1001,6 @@ TEST_F(WvCdmExtendedDurationTest, AutomatedOfflineSessionReleaseOnTimerEvent) { uint32_t initial_open_sessions = QueryStatus(kLevelDefault, wvcdm::QUERY_KEY_NUMBER_OF_OPEN_SESSIONS); - uint32_t max_sessions = - QueryStatus(kLevelDefault, wvcdm::QUERY_KEY_MAX_NUMBER_OF_SESSIONS); - decryptor_.OpenSession(g_key_system, NULL, kDefaultCdmIdentifier, NULL, &session_id_); GenerateKeyRequest(kOfflineClip4, kLicenseTypeOffline); @@ -1059,9 +1054,6 @@ TEST_F(WvCdmExtendedDurationTest, AutomatedOfflineSessionReleaseOnOpenSession) { uint32_t initial_open_sessions = QueryStatus(kLevelDefault, wvcdm::QUERY_KEY_NUMBER_OF_OPEN_SESSIONS); - uint32_t max_sessions = - QueryStatus(kLevelDefault, wvcdm::QUERY_KEY_MAX_NUMBER_OF_SESSIONS); - decryptor_.OpenSession(g_key_system, NULL, kDefaultCdmIdentifier, NULL, &session_id_); GenerateKeyRequest(kOfflineClip4, kLicenseTypeOffline); @@ -1398,7 +1390,6 @@ TEST_P(WvCdmStreamingUsageReportTest, UsageTest) { decryptor_.CloseSession(session_id_); // Create usage report and validate - uint32_t num_usage_info = 0; CdmUsageInfo usage_info; CdmUsageInfoReleaseMessage release_msg; CdmResponseType status = decryptor_.GetUsageInfo( diff --git a/libwvdrmengine/cdm/test/cdm_feature_test.cpp b/libwvdrmengine/cdm/test/cdm_feature_test.cpp index 1d331de7..7e5552b5 100644 --- a/libwvdrmengine/cdm/test/cdm_feature_test.cpp +++ b/libwvdrmengine/cdm/test/cdm_feature_test.cpp @@ -47,12 +47,11 @@ namespace { #define N_ELEM(a) (sizeof(a) / sizeof(a[0])) -const char kPathDelimiter = '/'; - // HTTP response codes. const int kHttpOk = 200; -const int kHttpBadRequest = 400; -const int kHttpInternalServerError = 500; +// The following two responses are unused, but left here for human debuggers. +// const int kHttpBadRequest = 400; +// const int kHttpInternalServerError = 500; // Default license server, can be configured using --server command line option // Default key id (pssh), can be configured using --keyid command line option diff --git a/libwvdrmengine/cdm/test/request_license_test.cpp b/libwvdrmengine/cdm/test/request_license_test.cpp index c0476af1..56da4c35 100644 --- a/libwvdrmengine/cdm/test/request_license_test.cpp +++ b/libwvdrmengine/cdm/test/request_license_test.cpp @@ -42,8 +42,6 @@ namespace { #define N_ELEM(a) (sizeof(a)/sizeof(a[0])) -const char kPathDelimiter = '/'; - // HTTP response codes. const int kHttpOk = 200; const int kHttpBadRequest = 400; diff --git a/libwvdrmengine/level3/arm/Android.mk b/libwvdrmengine/level3/arm/Android.mk index 97a33ebb..0e4038a4 100644 --- a/libwvdrmengine/level3/arm/Android.mk +++ b/libwvdrmengine/level3/arm/Android.mk @@ -2,7 +2,8 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) LOCAL_CFLAGS := \ -DDYNAMIC_ADAPTER \ - -Wno-unused + -Wno-unused \ + -Wno-unused-parameter LOCAL_C_INCLUDES := \ system/core/include \ vendor/widevine/libwvdrmengine/cdm/core/include \ diff --git a/libwvdrmengine/level3/arm64/Android.mk b/libwvdrmengine/level3/arm64/Android.mk index 3654ddf6..66daa31c 100644 --- a/libwvdrmengine/level3/arm64/Android.mk +++ b/libwvdrmengine/level3/arm64/Android.mk @@ -2,7 +2,8 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) LOCAL_CFLAGS := \ -DDYNAMIC_ADAPTER \ - -Wno-unused + -Wno-unused \ + -Wno-unused-parameter LOCAL_C_INCLUDES := \ system/core/include \ vendor/widevine/libwvdrmengine/cdm/core/include \ diff --git a/libwvdrmengine/level3/mips/Android.mk b/libwvdrmengine/level3/mips/Android.mk index f6e62a7e..8e5f6849 100644 --- a/libwvdrmengine/level3/mips/Android.mk +++ b/libwvdrmengine/level3/mips/Android.mk @@ -2,7 +2,8 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) LOCAL_CFLAGS := \ -DDYNAMIC_ADAPTER \ - -Wno-unused + -Wno-unused \ + -Wno-unused-parameter LOCAL_C_INCLUDES := \ system/core/include \ vendor/widevine/libwvdrmengine/cdm/core/include \ diff --git a/libwvdrmengine/level3/mips64/Android.mk b/libwvdrmengine/level3/mips64/Android.mk index 5e503dd8..354528fa 100644 --- a/libwvdrmengine/level3/mips64/Android.mk +++ b/libwvdrmengine/level3/mips64/Android.mk @@ -2,7 +2,8 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) LOCAL_CFLAGS := \ -DDYNAMIC_ADAPTER \ - -Wno-unused + -Wno-unused \ + -Wno-unused-parameter LOCAL_C_INCLUDES := \ system/core/include \ vendor/widevine/libwvdrmengine/cdm/core/include \ diff --git a/libwvdrmengine/level3/x86/Android.mk b/libwvdrmengine/level3/x86/Android.mk index d63a2460..92b8bfd4 100644 --- a/libwvdrmengine/level3/x86/Android.mk +++ b/libwvdrmengine/level3/x86/Android.mk @@ -2,7 +2,8 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) LOCAL_CFLAGS := \ -DDYNAMIC_ADAPTER \ - -Wno-unused + -Wno-unused \ + -Wno-unused-parameter LOCAL_C_INCLUDES := \ system/core/include \ vendor/widevine/libwvdrmengine/cdm/core/include \ diff --git a/libwvdrmengine/level3/x86_64/Android.mk b/libwvdrmengine/level3/x86_64/Android.mk index 9039763d..ca3aa664 100644 --- a/libwvdrmengine/level3/x86_64/Android.mk +++ b/libwvdrmengine/level3/x86_64/Android.mk @@ -2,7 +2,8 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) LOCAL_CFLAGS := \ -DDYNAMIC_ADAPTER \ - -Wno-unused + -Wno-unused \ + -Wno-unused-parameter LOCAL_C_INCLUDES := \ system/core/include \ vendor/widevine/libwvdrmengine/cdm/core/include \ diff --git a/libwvdrmengine/mediacrypto/test/WVCryptoPlugin_test.cpp b/libwvdrmengine/mediacrypto/test/WVCryptoPlugin_test.cpp index 46ef48fa..811e98b5 100644 --- a/libwvdrmengine/mediacrypto/test/WVCryptoPlugin_test.cpp +++ b/libwvdrmengine/mediacrypto/test/WVCryptoPlugin_test.cpp @@ -475,7 +475,6 @@ TEST_F(WVCryptoPluginTest, CommunicatesSecureBufferRequest) { WVCryptoPlugin plugin(sessionId, kSessionIdSize, cdm.get()); uint32_t bytesWritten = 0; - Status err = Status::OK; std::string errorDetailMessage; DestinationBuffer hDestination; hDestination.type = BufferType::SHARED_MEMORY; @@ -590,7 +589,6 @@ TEST_F(WVCryptoPluginTest, SetsFlagsForMinimumSubsampleRuns) { WVCryptoPlugin plugin(sessionId, kSessionIdSize, cdm.get()); uint32_t bytesWritten = 0; - Status err = Status::OK; std::string errorDetailMessage; DestinationBuffer hDestination; hDestination.type = BufferType::SHARED_MEMORY; @@ -705,7 +703,6 @@ TEST_F(WVCryptoPluginTest, AllowsSessionIdChanges) { WVCryptoPlugin plugin(blank, 0, cdm.get()); uint32_t bytesWritten = 0; - Status err = Status::OK; std::string errorDetailMessage; DestinationBuffer hDestination; hDestination.type = BufferType::SHARED_MEMORY; diff --git a/libwvdrmengine/mediadrm/test/WVDrmPlugin_test.cpp b/libwvdrmengine/mediadrm/test/WVDrmPlugin_test.cpp index 1d0d8985..14f20c51 100644 --- a/libwvdrmengine/mediadrm/test/WVDrmPlugin_test.cpp +++ b/libwvdrmengine/mediadrm/test/WVDrmPlugin_test.cpp @@ -730,7 +730,6 @@ TEST_F(WVDrmPluginTest, QueriesKeyStatus) { for (std::map::iterator itr = expectedLicenseStatus.begin(); itr != expectedLicenseStatus.end(); ++itr) { - const std::string& key = itr->first; keyValuePair.value = hLicenseStatus[i++].value; EXPECT_EQ(itr->second.c_str(), std::string(keyValuePair.value.c_str())); } @@ -1409,7 +1408,6 @@ TEST_F(WVDrmPluginTest, FailsGenericMethodsWithoutAnAlgorithmSet) { std::vector input; std::vector iv; std::vector output; - bool match; // Provide expected behavior to support session creation EXPECT_CALL(*cdm, OpenSession(StrEq("com.widevine"), _, _, _, _)) @@ -1697,7 +1695,6 @@ TEST_F(WVDrmPluginTest, CallsGenericVerify) { message.assign(messageRaw, messageRaw + kDataSize); std::vector signature; signature.assign(signatureRaw, signatureRaw + kSignatureSize); - bool match; { InSequence calls; @@ -2364,7 +2361,6 @@ TEST_F(WVDrmPluginTest, CanSetSessionSharing) { } WVDrmPlugin plugin(cdm.get(), appPackageName, &crypto, false); - Status res; // Test turning on session sharing Status status = plugin.setPropertyString(hidl_string("sessionSharing"), @@ -2461,4 +2457,3 @@ TEST_F(WVDrmPluginTest, AllowsStoringOfSessionSharingId) { } // namespace drm } // namespace hardware } // namespace wvdrm -