Removed some unused parameters; added SAL_UNUSED_PARAMETER.

SAL_UNUSED_PARAMETER (expanding to __attribute__ ((unused)) for GCC)
is used to annotate legitimately unused parameters, so that static
analysis tools can tell legitimately unused parameters from truly
unnecessary ones.  To that end, some patches for external modules
are also added, that are only applied when compiling with GCC and
add necessary __attribute__ ((unused)) in headers.

8 files changed, 29 insertions, 25 deletions

diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx
index f0b9d64859f9..0b92ab6814e9 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx
@@ -520,8 +520,8 @@ unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
 
 //==================================================================================================
 void bridges::cpp_uno::shared::VtableFactory::flushCode(
-    unsigned char const *, unsigned char const * )
-{
-}
+    SAL_UNUSED_PARAMETER unsigned char const *,
+    SAL_UNUSED_PARAMETER unsigned char const * )
+{}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx
index c39f6ddb8101..341a128a7045 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx
@@ -57,7 +57,7 @@ using namespace ::__cxxabiv1;
 namespace CPPU_CURRENT_NAMESPACE
 {
 
-void dummy_can_throw_anything( char const * )
+void dummy_can_throw_anything( SAL_UNUSED_PARAMETER char const * )
 {
 }
 
diff --git a/bridges/source/cpp_uno/shared/component.cxx b/bridges/source/cpp_uno/shared/component.cxx
index c40c4515179f..b6914de1a97e 100644
--- a/bridges/source/cpp_uno/shared/component.cxx
+++ b/bridges/source/cpp_uno/shared/component.cxx
@@ -189,7 +189,8 @@ static void SAL_CALL releaseInterface( uno_ExtEnvironment * pExtEnv, void * pCpp
     uno_Environment_invoke(&pExtEnv->aBase, s_stub_releaseInterface, pExtEnv, pCppI);
 }
 
-static void SAL_CALL environmentDisposing( uno_Environment * ) SAL_THROW( () )
+static void SAL_CALL environmentDisposing(
+    SAL_UNUSED_PARAMETER uno_Environment * ) SAL_THROW( () )
 {
     bridges::cpp_uno::shared::g_moduleCount.modCnt.release(
         &bridges::cpp_uno::shared::g_moduleCount.modCnt );
diff --git a/bridges/source/cpp_uno/shared/vtablefactory.cxx b/bridges/source/cpp_uno/shared/vtablefactory.cxx
index 830d899ea91a..d44c2e6f52bd 100644
--- a/bridges/source/cpp_uno/shared/vtablefactory.cxx
+++ b/bridges/source/cpp_uno/shared/vtablefactory.cxx
@@ -74,7 +74,9 @@ using bridges::cpp_uno::shared::VtableFactory;
 
 namespace {
 
-extern "C" void * SAL_CALL allocExec(rtl_arena_type *, sal_Size * size) {
+extern "C" void * SAL_CALL allocExec(
+    SAL_UNUSED_PARAMETER rtl_arena_type *, sal_Size * size)
+{
     sal_Size pagesize;
 #if defined SAL_UNX
 #if defined FREEBSD || defined NETBSD || defined OPENBSD || defined DRAGONFLY
@@ -113,7 +115,7 @@ extern "C" void * SAL_CALL allocExec(rtl_arena_type *, sal_Size * size) {
 }
 
 extern "C" void SAL_CALL freeExec(
-    rtl_arena_type *, void * address, sal_Size size)
+    SAL_UNUSED_PARAMETER rtl_arena_type *, void * address, sal_Size size)
 {
 #if defined SAL_UNX
     munmap(static_cast< char * >(address), size);
diff --git a/bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/JNI_proxy.java b/bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/JNI_proxy.java
index 076d568e9c91..7625df04b747 100644
--- a/bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/JNI_proxy.java
+++ b/bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/JNI_proxy.java
@@ -137,7 +137,7 @@ public final class JNI_proxy implements java.lang.reflect.InvocationHandler
 
     //__________________________________________________________________________
     private native Object dispatch_call(
-        long bridge_handle, String decl_class, String method, Object args [] )
+        long bridge_handle, String method, Object args [] )
         throws Throwable;
 
     // InvocationHandler impl
@@ -172,8 +172,7 @@ public final class JNI_proxy implements java.lang.reflect.InvocationHandler
         else if (decl_class.isAssignableFrom( m_class ))
         {
             // dispatch interface call
-            return dispatch_call(
-                m_bridge_handle, decl_class.getName(), method_name, args );
+            return dispatch_call( m_bridge_handle, method_name, args );
         }
         // IQueryInterface impl
         else if (IQueryInterface.class.equals( decl_class ))
@@ -185,9 +184,7 @@ public final class JNI_proxy implements java.lang.reflect.InvocationHandler
                     m_java_env.getRegisteredInterface( m_oid, (Type)args[ 0 ] );
                 if (null == registered_proxy)
                 {
-                    return dispatch_call(
-                        m_bridge_handle,
-                        "com.sun.star.uno.XInterface", method_name, args );
+                    return dispatch_call( m_bridge_handle, method_name, args );
                 }
                 else
                 {
diff --git a/bridges/source/jni_uno/jni_info.cxx b/bridges/source/jni_uno/jni_info.cxx
index 4a3228c043f4..a5ed28aacb5e 100644
--- a/bridges/source/jni_uno/jni_info.cxx
+++ b/bridges/source/jni_uno/jni_info.cxx
@@ -984,7 +984,7 @@ extern "C"
 //------------------------------------------------------------------------------
 JNIEXPORT void
 JNICALL Java_com_sun_star_bridges_jni_1uno_JNI_1info_1holder_finalize__J(
-    JNIEnv * jni_env, jobject, jlong jni_info_handle )
+    JNIEnv * jni_env, SAL_UNUSED_PARAMETER jobject, jlong jni_info_handle )
     SAL_THROW_EXTERN_C()
 {
     ::jni_uno::JNI_info * jni_info =
diff --git a/bridges/source/jni_uno/jni_java2uno.cxx b/bridges/source/jni_uno/jni_java2uno.cxx
index d8496f049841..55674b44dd3d 100644
--- a/bridges/source/jni_uno/jni_java2uno.cxx
+++ b/bridges/source/jni_uno/jni_java2uno.cxx
@@ -390,8 +390,8 @@ extern "C"
 //------------------------------------------------------------------------------
 JNIEXPORT jobject
 JNICALL Java_com_sun_star_bridges_jni_1uno_JNI_1proxy_dispatch_1call(
-    JNIEnv * jni_env, jobject jo_proxy, jlong bridge_handle, jstring,
-    jstring jo_method, jobjectArray jo_args /* may be 0 */ )
+    JNIEnv * jni_env, jobject jo_proxy, jlong bridge_handle, jstring jo_method,
+    jobjectArray jo_args /* may be 0 */ )
     SAL_THROW_EXTERN_C()
 {
     Bridge const * bridge = reinterpret_cast< Bridge const * >( bridge_handle );
diff --git a/bridges/source/jni_uno/nativethreadpool.cxx b/bridges/source/jni_uno/nativethreadpool.cxx
index b51031756889..8ed0d9ee27a7 100644
--- a/bridges/source/jni_uno/nativethreadpool.cxx
+++ b/bridges/source/jni_uno/nativethreadpool.cxx
@@ -94,7 +94,7 @@ static void SAL_CALL executeRequest(void * data) {
 
 extern "C" JNIEXPORT jbyteArray JNICALL
 Java_com_sun_star_lib_uno_environments_remote_NativeThreadPool_threadId(
-    JNIEnv * env, jclass) SAL_THROW_EXTERN_C()
+    JNIEnv * env, SAL_UNUSED_PARAMETER jclass) SAL_THROW_EXTERN_C()
 {
     sal_Sequence * s = 0;
     uno_getIdOfCurrentThread(&s); //TODO: out of memory
@@ -119,7 +119,7 @@ Java_com_sun_star_lib_uno_environments_remote_NativeThreadPool_threadId(
 
 extern "C" JNIEXPORT jlong JNICALL
 Java_com_sun_star_lib_uno_environments_remote_NativeThreadPool_create(
-    JNIEnv * env, jclass) SAL_THROW_EXTERN_C()
+    JNIEnv * env, SAL_UNUSED_PARAMETER jclass) SAL_THROW_EXTERN_C()
 {
     JavaVM * vm;
     if (env->GetJavaVM(&vm) != JNI_OK) { //TODO: no Java exception raised?
@@ -149,14 +149,15 @@ Java_com_sun_star_lib_uno_environments_remote_NativeThreadPool_create(
 
 extern "C" JNIEXPORT void JNICALL
 Java_com_sun_star_lib_uno_environments_remote_NativeThreadPool_attach(
-    JNIEnv *, jclass, jlong pool) SAL_THROW_EXTERN_C()
+    SAL_UNUSED_PARAMETER JNIEnv *, SAL_UNUSED_PARAMETER jclass, jlong pool)
+    SAL_THROW_EXTERN_C()
 {
     uno_threadpool_attach(reinterpret_cast< Pool * >(pool)->pool);
 }
 
 extern "C" JNIEXPORT jobject JNICALL
 Java_com_sun_star_lib_uno_environments_remote_NativeThreadPool_enter(
-    JNIEnv * env, jclass, jlong pool) SAL_THROW_EXTERN_C()
+    JNIEnv * env, SAL_UNUSED_PARAMETER jclass, jlong pool) SAL_THROW_EXTERN_C()
 {
     jobject job;
     uno_threadpool_enter(
@@ -172,15 +173,16 @@ Java_com_sun_star_lib_uno_environments_remote_NativeThreadPool_enter(
 
 extern "C" JNIEXPORT void JNICALL
 Java_com_sun_star_lib_uno_environments_remote_NativeThreadPool_detach(
-    JNIEnv *, jclass, jlong pool) SAL_THROW_EXTERN_C()
+    SAL_UNUSED_PARAMETER JNIEnv *, SAL_UNUSED_PARAMETER jclass, jlong pool)
+    SAL_THROW_EXTERN_C()
 {
     uno_threadpool_detach(reinterpret_cast< Pool * >(pool)->pool);
 }
 
 extern "C" JNIEXPORT void JNICALL
 Java_com_sun_star_lib_uno_environments_remote_NativeThreadPool_putJob(
-    JNIEnv * env, jclass, jlong pool, jbyteArray threadId, jobject job,
-    jboolean request, jboolean oneWay) SAL_THROW_EXTERN_C()
+    JNIEnv * env, SAL_UNUSED_PARAMETER jclass, jlong pool, jbyteArray threadId,
+    jobject job, jboolean request, jboolean oneWay) SAL_THROW_EXTERN_C()
 {
     void * s = env->GetPrimitiveArrayCritical(threadId, 0);
     if (s == 0) {
@@ -214,14 +216,16 @@ Java_com_sun_star_lib_uno_environments_remote_NativeThreadPool_putJob(
 
 extern "C" JNIEXPORT void JNICALL
 Java_com_sun_star_lib_uno_environments_remote_NativeThreadPool_dispose(
-    JNIEnv *, jclass, jlong pool) SAL_THROW_EXTERN_C()
+    SAL_UNUSED_PARAMETER JNIEnv *, SAL_UNUSED_PARAMETER jclass, jlong pool)
+    SAL_THROW_EXTERN_C()
 {
     uno_threadpool_dispose(reinterpret_cast< Pool * >(pool)->pool);
 }
 
 extern "C" JNIEXPORT void JNICALL
 Java_com_sun_star_lib_uno_environments_remote_NativeThreadPool_destroy(
-    JNIEnv *, jclass, jlong pool) SAL_THROW_EXTERN_C()
+    SAL_UNUSED_PARAMETER JNIEnv *, SAL_UNUSED_PARAMETER jclass, jlong pool)
+    SAL_THROW_EXTERN_C()
 {
     Pool * p = reinterpret_cast< Pool * >(pool);
     uno_threadpool_destroy(p->pool);