From 5de6996772dccf69c81a3f5ada98ceb863c367c1 Mon Sep 17 00:00:00 2001 From: Chih-Hung Hsieh Date: Wed, 15 Aug 2018 15:07:30 -0700 Subject: Fix errors in LOG_FATAL_IF arguments. They were found only when compiled with clang-tidy. Bug: 111850071 Test: build with WITH_TIDY=1 Change-Id: I696b9095dc44e9ed7a8a7a90346804a01de39072 Merged-In: I696b9095dc44e9ed7a8a7a90346804a01de39072 (cherry picked from commit acb1de84434480d80a33499d93df1e14f1f2ed03) --- media/jni/android_media_MediaDrm.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/media/jni/android_media_MediaDrm.cpp b/media/jni/android_media_MediaDrm.cpp index 54541f02f575..7cf8828c0623 100644 --- a/media/jni/android_media_MediaDrm.cpp +++ b/media/jni/android_media_MediaDrm.cpp @@ -43,27 +43,27 @@ namespace android { #define FIND_CLASS(var, className) \ var = env->FindClass(className); \ - LOG_FATAL_IF(! (var), "Unable to find class " className); + LOG_FATAL_IF(! (var), "Unable to find class %s", className); #define GET_FIELD_ID(var, clazz, fieldName, fieldDescriptor) \ var = env->GetFieldID(clazz, fieldName, fieldDescriptor); \ - LOG_FATAL_IF(! (var), "Unable to find field " fieldName); + LOG_FATAL_IF(! (var), "Unable to find field %s", fieldName); #define GET_METHOD_ID(var, clazz, fieldName, fieldDescriptor) \ var = env->GetMethodID(clazz, fieldName, fieldDescriptor); \ - LOG_FATAL_IF(! (var), "Unable to find method " fieldName); + LOG_FATAL_IF(! (var), "Unable to find method %s", fieldName); #define GET_STATIC_FIELD_ID(var, clazz, fieldName, fieldDescriptor) \ var = env->GetStaticFieldID(clazz, fieldName, fieldDescriptor); \ - LOG_FATAL_IF(! (var), "Unable to find field " fieldName); + LOG_FATAL_IF(! (var), "Unable to find field %s", fieldName); #define GET_STATIC_METHOD_ID(var, clazz, fieldName, fieldDescriptor) \ var = env->GetStaticMethodID(clazz, fieldName, fieldDescriptor); \ - LOG_FATAL_IF(! (var), "Unable to find static method " fieldName); + LOG_FATAL_IF(! (var), "Unable to find static method %s", fieldName); -#define GET_STATIC_OBJECT_FIELD(var, clazz, fieldName) \ - var = env->GetStaticObjectField(clazz, fieldName); \ - LOG_FATAL_IF(! (var), "Unable to find static object field " fieldName); +#define GET_STATIC_OBJECT_FIELD(var, clazz, fieldId) \ + var = env->GetStaticObjectField(clazz, fieldId); \ + LOG_FATAL_IF(! (var), "Unable to find static object field %p", fieldId); struct RequestFields { -- cgit v1.2.3-59-g8ed1b