From 4048a4bcb1ea709ddb83a4fde3ff5c53e642f7d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bernhard=20Rosenkr=C3=A4nzer?= Date: Sun, 23 Nov 2014 22:24:32 +0100 Subject: [PATCH] Remove unused variables and functions, don't warn about unused parameters MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove unused variables and static functions clang complains about, disable warnings about unused parameters (needed for clang and for gcc with -Wextra enabled) Change-Id: I76a22cd0158b3c7375c54e3d4d15bc1ac448591e Signed-off-by: Bernhard Rosenkränzer --- core/jni/android_nio_utils.h | 4 ++-- media/jni/android_media_MediaPlayer.cpp | 2 -- media/jni/android_media_MediaRecorder.cpp | 2 -- media/jni/android_mtp_MtpDatabase.cpp | 2 -- media/jni/android_mtp_MtpDevice.cpp | 2 -- media/jni/android_mtp_MtpServer.cpp | 2 -- media/mca/filterfw/native/core/shader_program.cpp | 7 ------- services/core/jni/Android.mk | 2 +- .../core/jni/com_android_server_hdmi_HdmiCecController.cpp | 1 + services/core/jni/com_android_server_tv_TvInputHal.cpp | 1 + 10 files changed, 5 insertions(+), 20 deletions(-) diff --git a/core/jni/android_nio_utils.h b/core/jni/android_nio_utils.h index bd5f20abaf4ca..c634cb9177196 100644 --- a/core/jni/android_nio_utils.h +++ b/core/jni/android_nio_utils.h @@ -58,9 +58,9 @@ class AutoBufferPointer { public: AutoBufferPointer(JNIEnv* env, jobject nioBuffer, jboolean commit); ~AutoBufferPointer(); - + void* pointer() const { return fPointer; } - + private: JNIEnv* fEnv; void* fPointer; diff --git a/media/jni/android_media_MediaPlayer.cpp b/media/jni/android_media_MediaPlayer.cpp index 73a924def2d3d..820de5b1ab863 100644 --- a/media/jni/android_media_MediaPlayer.cpp +++ b/media/jni/android_media_MediaPlayer.cpp @@ -895,8 +895,6 @@ static JNINativeMethod gMethods[] = { {"setNextMediaPlayer", "(Landroid/media/MediaPlayer;)V", (void *)android_media_MediaPlayer_setNextMediaPlayer}, }; -static const char* const kClassPathName = "android/media/MediaPlayer"; - // This function only registers the native methods static int register_android_media_MediaPlayer(JNIEnv *env) { diff --git a/media/jni/android_media_MediaRecorder.cpp b/media/jni/android_media_MediaRecorder.cpp index 902da4fa40c1c..ab8b4b8fd9c90 100644 --- a/media/jni/android_media_MediaRecorder.cpp +++ b/media/jni/android_media_MediaRecorder.cpp @@ -509,8 +509,6 @@ static JNINativeMethod gMethods[] = { {"native_finalize", "()V", (void *)android_media_MediaRecorder_native_finalize}, }; -static const char* const kClassPathName = "android/media/MediaRecorder"; - // This function only registers the native methods, and is called from // JNI_OnLoad in android_media_MediaPlayer.cpp int register_android_media_MediaRecorder(JNIEnv *env) diff --git a/media/jni/android_mtp_MtpDatabase.cpp b/media/jni/android_mtp_MtpDatabase.cpp index 5d1a0180e0bab..f381488ae00d9 100644 --- a/media/jni/android_mtp_MtpDatabase.cpp +++ b/media/jni/android_mtp_MtpDatabase.cpp @@ -1174,8 +1174,6 @@ static JNINativeMethod gMtpPropertyGroupMethods[] = { (void *)android_mtp_MtpPropertyGroup_format_date_time}, }; -static const char* const kClassPathName = "android/mtp/MtpDatabase"; - int register_android_mtp_MtpDatabase(JNIEnv *env) { jclass clazz; diff --git a/media/jni/android_mtp_MtpDevice.cpp b/media/jni/android_mtp_MtpDevice.cpp index fb15770197912..2dbd7dcc83356 100644 --- a/media/jni/android_mtp_MtpDevice.cpp +++ b/media/jni/android_mtp_MtpDevice.cpp @@ -417,8 +417,6 @@ static JNINativeMethod gMethods[] = { (void *)android_mtp_MtpDevice_import_file}, }; -static const char* const kClassPathName = "android/mtp/MtpDevice"; - int register_android_mtp_MtpDevice(JNIEnv *env) { jclass clazz; diff --git a/media/jni/android_mtp_MtpServer.cpp b/media/jni/android_mtp_MtpServer.cpp index 2f90dfede9944..2ce2a904e0f06 100644 --- a/media/jni/android_mtp_MtpServer.cpp +++ b/media/jni/android_mtp_MtpServer.cpp @@ -193,8 +193,6 @@ static JNINativeMethod gMethods[] = { {"native_remove_storage", "(I)V", (void *)android_mtp_MtpServer_remove_storage}, }; -static const char* const kClassPathName = "android/mtp/MtpServer"; - int register_android_mtp_MtpServer(JNIEnv *env) { jclass clazz; diff --git a/media/mca/filterfw/native/core/shader_program.cpp b/media/mca/filterfw/native/core/shader_program.cpp index 002327b45442d..f1ea7edc37645 100644 --- a/media/mca/filterfw/native/core/shader_program.cpp +++ b/media/mca/filterfw/native/core/shader_program.cpp @@ -30,9 +30,6 @@ namespace android { namespace filterfw { -// VBO attachment keys -static const int kDefaultVboKey = 1; - static const char* s_default_vertex_shader_source_ = "attribute vec4 a_position;\n" "attribute vec2 a_texcoord;\n" @@ -55,10 +52,6 @@ static void GetTileCoords(const float* b, float x, float y, float* xt, float* yt *yt = w0 * b[1] + w1 * b[3] + w2 * b[5] + w3 * b[7]; } -static inline float AdjustRatio(float current, float next) { - return (current + next) / 2.0; -} - // VertexAttrib implementation ///////////////////////////////////////////////// ShaderProgram::VertexAttrib::VertexAttrib() : is_const(true), diff --git a/services/core/jni/Android.mk b/services/core/jni/Android.mk index 99b33786331a4..dc073ad68d549 100644 --- a/services/core/jni/Android.mk +++ b/services/core/jni/Android.mk @@ -2,7 +2,7 @@ # files LOCAL_REL_DIR := core/jni -LOCAL_CFLAGS += -Wall -Werror +LOCAL_CFLAGS += -Wall -Werror -Wno-unused-parameter LOCAL_SRC_FILES += \ $(LOCAL_REL_DIR)/com_android_server_AlarmManagerService.cpp \ diff --git a/services/core/jni/com_android_server_hdmi_HdmiCecController.cpp b/services/core/jni/com_android_server_hdmi_HdmiCecController.cpp index 5c557b6e7c9ab..4a08b2def730d 100644 --- a/services/core/jni/com_android_server_hdmi_HdmiCecController.cpp +++ b/services/core/jni/com_android_server_hdmi_HdmiCecController.cpp @@ -408,6 +408,7 @@ static JNINativeMethod sMethods[] = { int register_android_server_hdmi_HdmiCecController(JNIEnv* env) { int res = jniRegisterNativeMethods(env, CLASS_PATH, sMethods, NELEM(sMethods)); LOG_FATAL_IF(res < 0, "Unable to register native methods."); + (void)res; // Don't scream about unused variable in the LOG_NDEBUG case return 0; } diff --git a/services/core/jni/com_android_server_tv_TvInputHal.cpp b/services/core/jni/com_android_server_tv_TvInputHal.cpp index d5abe0c25dae2..4914c62b8f8ca 100644 --- a/services/core/jni/com_android_server_tv_TvInputHal.cpp +++ b/services/core/jni/com_android_server_tv_TvInputHal.cpp @@ -634,6 +634,7 @@ int register_android_server_tv_TvInputHal(JNIEnv* env) { int res = jniRegisterNativeMethods(env, "com/android/server/tv/TvInputHal", gTvInputHalMethods, NELEM(gTvInputHalMethods)); LOG_FATAL_IF(res < 0, "Unable to register native methods."); + (void)res; // Don't complain about unused variable in the LOG_NDEBUG case jclass clazz; FIND_CLASS(clazz, "com/android/server/tv/TvInputHal");