From 7c704c78d3c652504c064b4ac7af55a2c1ee49bb Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Sat, 21 Jan 2012 15:21:16 +0100
Subject: 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.
---
 sal/osl/unx/file.cxx      | 4 ++--
 sal/osl/unx/file_impl.hxx | 2 +-
 sal/osl/unx/file_misc.cxx | 4 ++--
 sal/osl/unx/file_stat.cxx | 5 ++---
 4 files changed, 7 insertions(+), 8 deletions(-)

(limited to 'sal/osl/unx')

diff --git a/sal/osl/unx/file.cxx b/sal/osl/unx/file.cxx
index 7bb6bae051f1..84cb2f006811 100644
--- a/sal/osl/unx/file.cxx
+++ b/sal/osl/unx/file.cxx
@@ -114,7 +114,7 @@ struct FileHandle_Impl
     ~FileHandle_Impl();
 
     static void* operator new (size_t n);
-    static void  operator delete (void * p, size_t);
+    static void  operator delete (void * p);
 
     static size_t getpagesize();
 
@@ -282,7 +282,7 @@ void* FileHandle_Impl::operator new (size_t n)
 {
     return rtl_allocateMemory(n);
 }
-void FileHandle_Impl::operator delete (void * p, size_t)
+void FileHandle_Impl::operator delete (void * p)
 {
     rtl_freeMemory(p);
 }
diff --git a/sal/osl/unx/file_impl.hxx b/sal/osl/unx/file_impl.hxx
index 011c34c01ae4..119859d783d8 100644
--- a/sal/osl/unx/file_impl.hxx
+++ b/sal/osl/unx/file_impl.hxx
@@ -44,7 +44,7 @@ struct DirectoryItem_Impl
     ~DirectoryItem_Impl();
 
     static void * operator new(size_t n);
-    static void operator delete (void * p, size_t);
+    static void operator delete (void * p);
 
     void acquire(); /* @see osl_acquireDirectoryItem() */
     void release(); /* @see osl_releaseDirectoryItem() */
diff --git a/sal/osl/unx/file_misc.cxx b/sal/osl/unx/file_misc.cxx
index 7c84086b42ff..06bb72b80e20 100644
--- a/sal/osl/unx/file_misc.cxx
+++ b/sal/osl/unx/file_misc.cxx
@@ -104,7 +104,7 @@ void * DirectoryItem_Impl::operator new(size_t n)
 {
     return rtl_allocateMemory(n);
 }
-void DirectoryItem_Impl::operator delete(void * p, size_t)
+void DirectoryItem_Impl::operator delete(void * p)
 {
     rtl_freeMemory(p);
 }
@@ -310,7 +310,7 @@ static struct dirent* osl_readdir_impl_(DIR* pdir, sal_Bool bFilterLocalAndParen
  *  osl_getNextDirectoryItem
  ***************************************************************************/
 
-oslFileError SAL_CALL osl_getNextDirectoryItem(oslDirectory Directory, oslDirectoryItem* pItem, sal_uInt32 /*uHint*/)
+oslFileError SAL_CALL osl_getNextDirectoryItem(oslDirectory Directory, oslDirectoryItem* pItem, SAL_UNUSED_PARAMETER sal_uInt32 /*uHint*/)
 {
     oslDirectoryImpl* pDirImpl     = (oslDirectoryImpl*)Directory;
     rtl_uString*      ustrFileName = NULL;
diff --git a/sal/osl/unx/file_stat.cxx b/sal/osl/unx/file_stat.cxx
index e5fc091ad995..781d9995dd2d 100644
--- a/sal/osl/unx/file_stat.cxx
+++ b/sal/osl/unx/file_stat.cxx
@@ -345,7 +345,6 @@ oslFileError SAL_CALL osl_setFileAttributes( rtl_uString* ustrFileURL, sal_uInt6
 
 static oslFileError osl_psz_setFileTime (
     const sal_Char* pszFilePath,
-    const TimeValue* /*pCreationTime*/,
     const TimeValue* pLastAccessTime,
     const TimeValue* pLastWriteTime )
 {
@@ -426,7 +425,7 @@ static oslFileError osl_psz_setFileTime (
 
 oslFileError SAL_CALL osl_setFileTime (
     rtl_uString* ustrFileURL,
-    const TimeValue* pCreationTime,
+    SAL_UNUSED_PARAMETER const TimeValue* /* pCreationTime */,
     const TimeValue* pLastAccessTime,
     const TimeValue* pLastWriteTime )
 {
@@ -445,7 +444,7 @@ oslFileError SAL_CALL osl_setFileTime (
       return oslTranslateFileError( OSL_FET_ERROR, errno );
 #endif/* MACOSX */
 
-    return osl_psz_setFileTime( path, pCreationTime, pLastAccessTime, pLastWriteTime );
+    return osl_psz_setFileTime( path, pLastAccessTime, pLastWriteTime );
 }
 
 sal_Bool
-- 
cgit