widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix or ignore compiler warnings

Browse Source 
Merge from Widevine repo of http://go/wvgerrit/24688

b/35466719

Change-Id: If89f0cad0c61f37536a84f8dadaf08072356343a
This commit is contained in:
Fred Gylys-Colwell
2017-03-21 15:09:02 -07:00
parent c4aad89fd0
commit 85365a1497
6 changed files with 35 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libwvdrmengine/cdm/core/src/crypto_session.cpp
View File

@@ -106,7 +106,7 @@ void CryptoSession::Init() {
}
void CryptoSession::Terminate() {
LOGE("CryptoSession::Terminate: initialized_=%d, session_count_=%d",
LOGV("CryptoSession::Terminate: initialized_=%d, session_count_=%d",
initialized_, session_count_);
AutoLock auto_lock(crypto_lock_);
if (session_count_ > 0) {

8
libwvdrmengine/cdm/core/src/oemcrypto_adapter_dynamic.cpp
View File

@@ -334,7 +334,7 @@ void clear_cache_function(void *page, size_t len) {
// are true, and use "#ifndef USED_BUILTIN_CLEAR_CACHE" instead of #else.
#ifdef __has_builtin
#if __has_builtin(__builtin___clear_cache)
#pragma message "clear_cache_function is using __builtin___clear_cache."
#pragma message "(info): clear_cache_function is using __builtin___clear_cache."
#define USED_BUILTIN_CLEAR_CACHE
char *begin = static_cast<char *>(page);
char *end = begin + len;
@@ -343,7 +343,7 @@ void clear_cache_function(void *page, size_t len) {
#endif
#ifndef USED_BUILTIN_CLEAR_CACHE
#if __arm__
#pragma message "clear_cache_function is using arm asm."
#pragma message "(info): clear_cache_function is using arm asm."
// ARM Cache Flush System Call:
char *begin = static_cast<char *>(page);
char *end = begin + len;
@@ -361,7 +361,7 @@ void clear_cache_function(void *page, size_t len) {
: "r0", "r1", "r7"
);
#elif __mips__
#pragma message "clear_cache_function is using mips asm."
#pragma message "(info): clear_cache_function is using mips asm."
int result = syscall(__NR_cacheflush, page, len, ICACHE);
if (result) {
fprintf(stderr, "cacheflush failed!: errno=%d %s\n", errno,
@@ -369,7 +369,7 @@ void clear_cache_function(void *page, size_t len) {
exit(-1); // TODO(fredgc): figure out more graceful error handling.
}
#else
#pragma message "clear_cache_function is not doing anything."
#pragma message "(info): clear_cache_function is not doing anything."
// TODO(fredgc): silence warning about unused variables.
#endif
#endif