summaryrefslogtreecommitdiff
path: root/sal
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-04-14 12:44:47 +0200
committerNoel Grandin <noel@peralex.com>2015-04-15 11:47:12 +0200
commit71b809959bb8f775d83dc52628448bb8b8322b28 (patch)
treef9aa4308050eb7d55611068602c0cf0e3c1b3690 /sal
parent135907f2061550624ee1859745d94eee01849070 (diff)
remove unnecessary use of void in function declarations
ie. void f(void); becomes void f(); I used the following command to make the changes: git grep -lP '\(\s*void\s*\)' -- *.cxx \ | xargs perl -pi -w -e 's/(\w+)\s*\(\s*void\s*\)/$1\(\)/g;' and ran it for both .cxx and .hxx files. Change-Id: I314a1b56e9c14d10726e32841736b0ad5eef8ddd
Diffstat (limited to 'sal')
-rw-r--r--sal/cpprt/operators_new_delete.cxx2
-rw-r--r--sal/osl/all/compat.cxx2
-rw-r--r--sal/osl/unx/mutex.cxx2
-rw-r--r--sal/osl/unx/pipe.cxx2
-rw-r--r--sal/osl/unx/process_impl.cxx2
-rw-r--r--sal/osl/unx/saltime.hxx2
-rw-r--r--sal/osl/unx/signal.cxx8
-rw-r--r--sal/osl/unx/socket.cxx2
-rw-r--r--sal/osl/unx/thread.cxx16
-rw-r--r--sal/osl/unx/time.cxx2
-rw-r--r--sal/osl/w32/file_dirvol.cxx2
-rw-r--r--sal/osl/w32/process.cxx2
-rw-r--r--sal/osl/w32/signal.cxx4
-rw-r--r--sal/osl/w32/socket.cxx6
-rw-r--r--sal/qa/osl/file/osl_File.cxx2
-rw-r--r--sal/qa/osl/module/osl_Module.cxx2
-rw-r--r--sal/qa/osl/process/osl_process.cxx2
-rw-r--r--sal/qa/osl/profile/osl_old_testprofile.cxx2
-rw-r--r--sal/qa/osl/socket/osl_Socket.cxx4
-rw-r--r--sal/qa/osl/socket/sockethelper.cxx4
-rw-r--r--sal/qa/osl/socket/sockethelper.hxx4
-rw-r--r--sal/qa/rtl/process/rtl_Process.cxx2
-rw-r--r--sal/textenc/convertiso2022cn.cxx2
-rw-r--r--sal/workben/clipboardwben/testviewer/cbvtest.cxx4
-rw-r--r--sal/workben/test.cxx2
-rw-r--r--sal/workben/testfile.cxx42
-rw-r--r--sal/workben/testpip2.cxx2
-rw-r--r--sal/workben/testproc.cxx2
28 files changed, 65 insertions, 65 deletions
diff --git a/sal/cpprt/operators_new_delete.cxx b/sal/cpprt/operators_new_delete.cxx
index c03d8bda9830..064caa5946f5 100644
--- a/sal/cpprt/operators_new_delete.cxx
+++ b/sal/cpprt/operators_new_delete.cxx
@@ -93,7 +93,7 @@ const AllocatorTraits::signature_type ScalarTraits::g_signature = "new() ";
// Allocator
-static void default_handler (void)
+static void default_handler()
{
// Multithreading race in 'std::set_new_handler()' call sequence below.
throw std::bad_alloc();
diff --git a/sal/osl/all/compat.cxx b/sal/osl/all/compat.cxx
index ca5f340038c3..b43bae85d88b 100644
--- a/sal/osl/all/compat.cxx
+++ b/sal/osl/all/compat.cxx
@@ -158,7 +158,7 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL rtl_logfile_longTrace(char const *, ...) {
std::abort();
}
-SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL rtl_logfile_hasLogFile( void ) {
+SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL rtl_logfile_hasLogFile() {
for (;;) { std::abort(); } // avoid "must return a value" warnings
}
diff --git a/sal/osl/unx/mutex.cxx b/sal/osl/unx/mutex.cxx
index 7c8b365a2a2b..0f5f751d79c4 100644
--- a/sal/osl/unx/mutex.cxx
+++ b/sal/osl/unx/mutex.cxx
@@ -159,7 +159,7 @@ sal_Bool SAL_CALL osl_releaseMutex(oslMutexImpl *pMutex)
static oslMutexImpl globalMutexImpl;
-static void globalMutexInitImpl(void) {
+static void globalMutexInitImpl() {
pthread_mutexattr_t attr;
if (pthread_mutexattr_init(&attr) != 0 ||
pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE) ||
diff --git a/sal/osl/unx/pipe.cxx b/sal/osl/unx/pipe.cxx
index 9a559c2b8d1e..2bfe5f0a0170 100644
--- a/sal/osl/unx/pipe.cxx
+++ b/sal/osl/unx/pipe.cxx
@@ -73,7 +73,7 @@ static oslPipeError osl_PipeErrorFromNative(int nativeType)
return PipeError[i].error;
}
-oslPipe __osl_createPipeImpl(void)
+oslPipe __osl_createPipeImpl()
{
oslPipe pPipeImpl;
diff --git a/sal/osl/unx/process_impl.cxx b/sal/osl/unx/process_impl.cxx
index a7c42b11b001..9a1ebd03f570 100644
--- a/sal/osl/unx/process_impl.cxx
+++ b/sal/osl/unx/process_impl.cxx
@@ -156,7 +156,7 @@ oslProcessError SAL_CALL osl_getExecutableFile (rtl_uString ** ppustrFile)
/***************************************
osl_getCommandArgCount().
**************************************/
-sal_uInt32 SAL_CALL osl_getCommandArgCount (void)
+sal_uInt32 SAL_CALL osl_getCommandArgCount()
{
sal_uInt32 result = 0;
diff --git a/sal/osl/unx/saltime.hxx b/sal/osl/unx/saltime.hxx
index e72e09b43f89..03e8047e0a87 100644
--- a/sal/osl/unx/saltime.hxx
+++ b/sal/osl/unx/saltime.hxx
@@ -22,7 +22,7 @@
#include <sal/config.h>
-void sal_initGlobalTimer(void);
+void sal_initGlobalTimer();
#endif
diff --git a/sal/osl/unx/signal.cxx b/sal/osl/unx/signal.cxx
index 85773bd273cc..050aa81d0ade 100644
--- a/sal/osl/unx/signal.cxx
+++ b/sal/osl/unx/signal.cxx
@@ -169,7 +169,7 @@ static void getExecutableName_Impl (rtl_String ** ppstrProgName)
}
}
-static bool is_soffice_Impl (void)
+static bool is_soffice_Impl()
{
sal_Int32 idx = -1;
rtl_String * strProgName = 0;
@@ -183,7 +183,7 @@ static bool is_soffice_Impl (void)
return (idx != -1);
}
-static bool InitSignal(void)
+static bool InitSignal()
{
int i;
struct sigaction act;
@@ -272,7 +272,7 @@ static bool InitSignal(void)
return true;
}
-static bool DeInitSignal(void)
+static bool DeInitSignal()
{
int i;
struct sigaction act;
@@ -380,7 +380,7 @@ void CallSystemHandler(int Signal)
}
#if defined HAVE_VALGRIND_HEADERS
-static void DUMPCURRENTALLOCS(void)
+static void DUMPCURRENTALLOCS()
{
VALGRIND_PRINTF( "=== start memcheck dump of active allocations ===\n" );
diff --git a/sal/osl/unx/socket.cxx b/sal/osl/unx/socket.cxx
index a25a9f8b5dd6..0e5a1f0da0b0 100644
--- a/sal/osl/unx/socket.cxx
+++ b/sal/osl/unx/socket.cxx
@@ -466,7 +466,7 @@ void __osl_destroySocketImpl(oslSocket Socket)
#endif
}
-static oslSocketAddr __osl_createSocketAddr(void)
+static oslSocketAddr __osl_createSocketAddr()
{
oslSocketAddr pAddr = static_cast<oslSocketAddr>(rtl_allocateZeroMemory( sizeof( struct oslSocketAddrImpl )));
#if OSL_DEBUG_LEVEL > 1
diff --git a/sal/osl/unx/thread.cxx b/sal/osl/unx/thread.cxx
index e6bcc451a4c3..237db690cf8b 100644
--- a/sal/osl/unx/thread.cxx
+++ b/sal/osl/unx/thread.cxx
@@ -98,7 +98,7 @@ struct osl_thread_priority_st
};
#define OSL_THREAD_PRIORITY_INITIALIZER { 127, 96, 64, 32, 0 }
-static void osl_thread_priority_init_Impl (void);
+static void osl_thread_priority_init_Impl();
struct osl_thread_textencoding_st
{
@@ -107,7 +107,7 @@ struct osl_thread_textencoding_st
};
#define OSL_THREAD_TEXTENCODING_INITIALIZER { 0, RTL_TEXTENCODING_DONTKNOW }
-static void osl_thread_textencoding_init_Impl (void);
+static void osl_thread_textencoding_init_Impl();
struct osl_thread_global_st
{
@@ -123,9 +123,9 @@ static struct osl_thread_global_st g_thread =
OSL_THREAD_TEXTENCODING_INITIALIZER
};
-static void osl_thread_init_Impl (void);
+static void osl_thread_init_Impl();
-static Thread_Impl* osl_thread_construct_Impl (void);
+static Thread_Impl* osl_thread_construct_Impl();
static void osl_thread_destruct_Impl (Thread_Impl ** ppImpl);
static void* osl_thread_start_Impl (void * pData);
@@ -139,13 +139,13 @@ static sal_uInt16 insertThreadId (pthread_t hThread);
static sal_uInt16 lookupThreadId (pthread_t hThread);
static void removeThreadId (pthread_t hThread);
-static void osl_thread_init_Impl (void)
+static void osl_thread_init_Impl()
{
osl_thread_priority_init_Impl();
osl_thread_textencoding_init_Impl();
}
-Thread_Impl* osl_thread_construct_Impl (void)
+Thread_Impl* osl_thread_construct_Impl()
{
Thread_Impl* pImpl = new Thread_Impl;
if (pImpl)
@@ -692,7 +692,7 @@ oslThreadIdentifier SAL_CALL osl_getThreadIdentifier(oslThread Thread)
to have the "normal" priority.
*****************************************************************************/
-static void osl_thread_priority_init_Impl (void)
+static void osl_thread_priority_init_Impl()
{
#ifndef NO_PTHREAD_PRIORITY
struct sched_param param;
@@ -994,7 +994,7 @@ sal_Bool SAL_CALL osl_setThreadKeyData(oslThreadKey Key, void *pData)
/*****************************************************************************/
/* Thread Local Text Encoding */
/*****************************************************************************/
-static void osl_thread_textencoding_init_Impl (void)
+static void osl_thread_textencoding_init_Impl()
{
rtl_TextEncoding defaultEncoding;
diff --git a/sal/osl/unx/time.cxx b/sal/osl/unx/time.cxx
index 4abd99d4ed48..74ab972db414 100644
--- a/sal/osl/unx/time.cxx
+++ b/sal/osl/unx/time.cxx
@@ -259,7 +259,7 @@ sal_Bool SAL_CALL osl_getSystemTimeFromLocalTime( const TimeValue* pLocalTimeVal
return sal_False;
}
-void sal_initGlobalTimer(void)
+void sal_initGlobalTimer()
{
#ifdef __MACH__
clock_serv_t cclock;
diff --git a/sal/osl/w32/file_dirvol.cxx b/sal/osl/w32/file_dirvol.cxx
index 51bef22c0917..a5d060509463 100644
--- a/sal/osl/w32/file_dirvol.cxx
+++ b/sal/osl/w32/file_dirvol.cxx
@@ -272,7 +272,7 @@ typedef struct tagDRIVEENUM
LPCTSTR lpCurrent;
} DRIVEENUM, * PDRIVEENUM, FAR * LPDRIVEENUM;
-static HANDLE WINAPI OpenLogicalDrivesEnum(void)
+static HANDLE WINAPI OpenLogicalDrivesEnum()
{
LPDRIVEENUM pEnum = (LPDRIVEENUM)HeapAlloc( GetProcessHeap(), 0, sizeof(DRIVEENUM) );
if ( pEnum )
diff --git a/sal/osl/w32/process.cxx b/sal/osl/w32/process.cxx
index 722342867d0e..0a85135a5d40 100644
--- a/sal/osl/w32/process.cxx
+++ b/sal/osl/w32/process.cxx
@@ -322,7 +322,7 @@ oslProcessError SAL_CALL osl_getExecutableFile( rtl_uString **ppustrFile )
/***************************************************************************/
-sal_uInt32 SAL_CALL osl_getCommandArgCount(void)
+sal_uInt32 SAL_CALL osl_getCommandArgCount()
{
sal_uInt32 result = 0;
diff --git a/sal/osl/w32/signal.cxx b/sal/osl/w32/signal.cxx
index 28979f35a41e..51fe5ac93b77 100644
--- a/sal/osl/w32/signal.cxx
+++ b/sal/osl/w32/signal.cxx
@@ -50,7 +50,7 @@ static oslSignalHandlerImpl* SignalList;
static long WINAPI SignalHandlerFunction(LPEXCEPTION_POINTERS lpEP);
-static sal_Bool InitSignal(void)
+static sal_Bool InitSignal()
{
HMODULE hFaultRep;
@@ -70,7 +70,7 @@ static sal_Bool InitSignal(void)
return sal_True;
}
-static sal_Bool DeInitSignal(void)
+static sal_Bool DeInitSignal()
{
SetUnhandledExceptionFilter(NULL);
diff --git a/sal/osl/w32/socket.cxx b/sal/osl/w32/socket.cxx
index 5ec52cf98be5..0b98b3facc4d 100644
--- a/sal/osl/w32/socket.cxx
+++ b/sal/osl/w32/socket.cxx
@@ -269,7 +269,7 @@ static oslSocketDialupImpl *pDialupImpl = NULL;
/*
* __osl_createSocketDialupImpl.
*/
-static oslSocketDialupImpl* __osl_createSocketDialupImpl (void)
+static oslSocketDialupImpl* __osl_createSocketDialupImpl()
{
oslSocketDialupImpl *pImpl;
pImpl = (oslSocketDialupImpl*)rtl_allocateZeroMemory( sizeof (oslSocketDialupImpl));
@@ -343,7 +343,7 @@ static void __osl_destroySocketDialupImpl (oslSocketDialupImpl *pImpl)
/*
* __osl_querySocketDialupImpl.
*/
-static sal_Bool __osl_querySocketDialupImpl (void)
+static sal_Bool __osl_querySocketDialupImpl()
{
sal_Bool result;
@@ -371,7 +371,7 @@ static sal_Bool __osl_querySocketDialupImpl (void)
/*
* __osl_attemptSocketDialupImpl.
*/
-static sal_Bool __osl_attemptSocketDialupImpl (void)
+static sal_Bool __osl_attemptSocketDialupImpl()
{
sal_Bool result;
diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx
index cec250d6f4a1..2b5766225ac1 100644
--- a/sal/qa/osl/file/osl_File.cxx
+++ b/sal/qa/osl/file/osl_File.cxx
@@ -426,7 +426,7 @@ inline void changeFileMode( ::rtl::OUString & filepath, sal_Int32 mode )
}
#endif
-inline ::rtl::OUString getCurrentPID( void );
+inline ::rtl::OUString getCurrentPID();
// Beginning of the test cases for FileBase class
diff --git a/sal/qa/osl/module/osl_Module.cxx b/sal/qa/osl/module/osl_Module.cxx
index be812e04b161..56f781069f28 100644
--- a/sal/qa/osl/module/osl_Module.cxx
+++ b/sal/qa/osl/module/osl_Module.cxx
@@ -29,7 +29,7 @@ using ::rtl::OString;
/** get dll file URL.
*/
-inline ::rtl::OUString getDllURL( void )
+inline ::rtl::OUString getDllURL()
{
#if ( defined WNT ) // lib in Unix and lib in Windows are not same in file name.
::rtl::OUString libPath( "test_Module_DLL.dll" );
diff --git a/sal/qa/osl/process/osl_process.cxx b/sal/qa/osl/process/osl_process.cxx
index b053f9fdb135..4a9cd425658c 100644
--- a/sal/qa/osl/process/osl_process.cxx
+++ b/sal/qa/osl/process/osl_process.cxx
@@ -80,7 +80,7 @@ using ::rtl::OString;
/** get binary Path.
*/
-inline ::rtl::OUString getExecutablePath( void )
+inline ::rtl::OUString getExecutablePath()
{
::rtl::OUString dirPath;
osl::Module::getUrlFromAddress(
diff --git a/sal/qa/osl/profile/osl_old_testprofile.cxx b/sal/qa/osl/profile/osl_old_testprofile.cxx
index 97ef52143655..3cfba1247d65 100644
--- a/sal/qa/osl/profile/osl_old_testprofile.cxx
+++ b/sal/qa/osl/profile/osl_old_testprofile.cxx
@@ -38,7 +38,7 @@ namespace osl_Profile
CPPUNIT_TEST_SUITE_END( );
};
-void oldtests::test_profile(void)
+void oldtests::test_profile()
{
rtl::OUString baseUrl;
CPPUNIT_ASSERT(rtl::Bootstrap::get("UserInstallation", baseUrl));
diff --git a/sal/qa/osl/socket/osl_Socket.cxx b/sal/qa/osl/socket/osl_Socket.cxx
index 94eed88daa98..2c9e1ff58f98 100644
--- a/sal/qa/osl/socket/osl_Socket.cxx
+++ b/sal/qa/osl/socket/osl_Socket.cxx
@@ -128,7 +128,7 @@ inline void printUString( const ::rtl::OUString & str, const sal_Char * msg = ""
mindy: gethostbyname( "localhost" ), on Linux, it returns the hostname in /etc/hosts + domain name,
if no entry in /etc/hosts, it returns "localhost" + domain name
*/
-inline ::rtl::OUString getHost( void )
+inline ::rtl::OUString getHost()
{
struct hostent *hptr;
@@ -141,7 +141,7 @@ inline ::rtl::OUString getHost( void )
/** get the full host name of the current processor, such as "aegean.prc.sun.com" --mindyliu
*/
-inline ::rtl::OUString getThisHostname( void )
+inline ::rtl::OUString getThisHostname()
{
::rtl::OUString aUString;
#ifdef WNT
diff --git a/sal/qa/osl/socket/sockethelper.cxx b/sal/qa/osl/socket/sockethelper.cxx
index 3057c350f3a0..df4f5e7c11ca 100644
--- a/sal/qa/osl/socket/sockethelper.cxx
+++ b/sal/qa/osl/socket/sockethelper.cxx
@@ -86,7 +86,7 @@ void printUString( const ::rtl::OUString & str, const char* msg)
mindy: gethostbyname( "localhost" ), on Linux, it returns the hostname in /etc/hosts + domain name,
if no entry in /etc/hosts, it returns "localhost" + domain name
*/
-::rtl::OUString getHost( void )
+::rtl::OUString getHost()
{
struct hostent *hptr;
@@ -99,7 +99,7 @@ void printUString( const ::rtl::OUString & str, const char* msg)
/** get the full host name of the current processor, such as "aegean.prc.sun.com" --mindyliu
*/
-::rtl::OUString getThisHostname( void )
+::rtl::OUString getThisHostname()
{
::rtl::OUString aUString;
#ifdef WNT
diff --git a/sal/qa/osl/socket/sockethelper.hxx b/sal/qa/osl/socket/sockethelper.hxx
index 4debc78d87f4..9e400d8f3c05 100644
--- a/sal/qa/osl/socket/sockethelper.hxx
+++ b/sal/qa/osl/socket/sockethelper.hxx
@@ -109,10 +109,10 @@ void printUString( const ::rtl::OUString & str, const char * msg = "" );
mindy: gethostbyname( "localhost" ), on Linux, it returns the hostname in /etc/hosts + domain name,
if no entry in /etc/hosts, it returns "localhost" + domain name
*/
-::rtl::OUString getHost( void );
+::rtl::OUString getHost();
/** get the full host name of the current processor, such as "aegean.prc.sun.com" --mindyliu
*/
-::rtl::OUString getThisHostname( void );
+::rtl::OUString getThisHostname();
/** get IP by name, search /etc/hosts first, then search from dns, fail return OUString("")
*/
::rtl::OUString getIPbyName( rtl::OString const& str_name );
diff --git a/sal/qa/rtl/process/rtl_Process.cxx b/sal/qa/rtl/process/rtl_Process.cxx
index 535b4f1f903b..1cbfb58e073c 100644
--- a/sal/qa/rtl/process/rtl_Process.cxx
+++ b/sal/qa/rtl/process/rtl_Process.cxx
@@ -53,7 +53,7 @@ inline void printUString( const ::rtl::OUString & str, const sal_Char * msg = NU
printf("%s\n", aString.getStr( ) );
}
-inline ::rtl::OUString getModulePath( void )
+inline ::rtl::OUString getModulePath()
{
::rtl::OUString suDirPath;
::osl::Module::getUrlFromAddress(
diff --git a/sal/textenc/convertiso2022cn.cxx b/sal/textenc/convertiso2022cn.cxx
index afe946d62383..7adece94fff0 100644
--- a/sal/textenc/convertiso2022cn.cxx
+++ b/sal/textenc/convertiso2022cn.cxx
@@ -416,7 +416,7 @@ sal_Size ImplConvertIso2022CnToUnicode(void const * pData,
return pDestBufPtr - pDestBuf;
}
-void * ImplCreateUnicodeToIso2022CnContext(void)
+void * ImplCreateUnicodeToIso2022CnContext()
{
ImplUnicodeToIso2022CnContext * pContext =
new ImplUnicodeToIso2022CnContext;
diff --git a/sal/workben/clipboardwben/testviewer/cbvtest.cxx b/sal/workben/clipboardwben/testviewer/cbvtest.cxx
index f6057c86909a..b68375bb5e8d 100644
--- a/sal/workben/clipboardwben/testviewer/cbvtest.cxx
+++ b/sal/workben/clipboardwben/testviewer/cbvtest.cxx
@@ -59,7 +59,7 @@ void RegisterClipboardViewer( BOOL bRegister );
void ShowAvailableClipboardFormats( HWND hWnd, HDC hdc, PAINTSTRUCT ps, RECT rcWnd );
void ClearClipboardContent( HWND hWnd );
-void CALLBACK OnClipboardContentChange( void );
+void CALLBACK OnClipboardContentChange();
LRESULT CALLBACK WndProc( HWND, UINT, WPARAM, LPARAM );
LRESULT CALLBACK About( HWND, UINT, WPARAM, LPARAM );
@@ -322,7 +322,7 @@ void ClearClipboardContent( HWND hWnd )
}
// clipboard viewer callback function
-void CALLBACK OnClipboardContentChange( void )
+void CALLBACK OnClipboardContentChange()
{
++g_nCBChanges;
InvalidateRect( g_hwndMain, NULL, TRUE );
diff --git a/sal/workben/test.cxx b/sal/workben/test.cxx
index 0d04bece1686..faed0d8822ee 100644
--- a/sal/workben/test.cxx
+++ b/sal/workben/test.cxx
@@ -28,7 +28,7 @@ int _cdecl main( int argc, char * argv[] )
void test_int64();
test_int64();
- void test_profile(void);
+ void test_profile();
test_profile();
void test_OString();
diff --git a/sal/workben/testfile.cxx b/sal/workben/testfile.cxx
index cbe504317197..addb1b6b8603 100644
--- a/sal/workben/testfile.cxx
+++ b/sal/workben/testfile.cxx
@@ -105,7 +105,7 @@ sal_Bool testLineBreak( sal_Char *pCount , sal_uInt64 nLen , sal_uInt32 *cLineBr
// Initialization
-sal_Bool Initialize( void )
+sal_Bool Initialize()
{
DirectoryItem aItem;
FileStatus aStatus( osl_FileStatus_Mask_All );
@@ -258,7 +258,7 @@ sal_Bool Initialize( void )
// Shutdown
-sal_Bool Shutdown( void )
+sal_Bool Shutdown()
{
sal_Bool fSuccess=sal_True;
FileBase::RC rc;
@@ -425,7 +425,7 @@ TimeValue getSystemTime()
// DirectoryOpenAndCloseTest
-void DirectoryOpenAndCloseTest( void )
+void DirectoryOpenAndCloseTest()
{
FileBase::RC rc;
Directory *pDir;
@@ -536,7 +536,7 @@ void DirectoryOpenAndCloseTest( void )
// DirectoryCreateAndRemoveTest
-void DirectoryCreateAndRemoveTest( void )
+void DirectoryCreateAndRemoveTest()
{
FileBase::RC rc,rc1;
Directory *pDir;
@@ -614,7 +614,7 @@ void DirectoryCreateAndRemoveTest( void )
// FileOpenAndCloseTest
-static void FileOpenAndCloseTest( void )
+static void FileOpenAndCloseTest()
{
FileBase::RC rc;
@@ -720,7 +720,7 @@ void FileCreateAndRemoveTest()
// FileWriteAndReadTest
-void FileWriteAndReadTest( void )
+void FileWriteAndReadTest()
{
FileBase::RC rc;
@@ -804,7 +804,7 @@ void FileWriteAndReadTest( void )
// FileCopyMoveTest
-void FileCopyAndMoveTest( void )
+void FileCopyAndMoveTest()
{
FileBase::RC rc;
@@ -962,7 +962,7 @@ void FileCopyAndMoveTest( void )
// FileSizeTest
-void FileSizeTest( void )
+void FileSizeTest()
{
FileBase::RC rc;
sal_uInt64 filesize;
@@ -1042,7 +1042,7 @@ void FileSizeTest( void )
// FilePointerTest
-void FilePointerTest( void )
+void FilePointerTest()
{
FileBase::RC rc;
sal_uInt64 filepointer;
@@ -1114,7 +1114,7 @@ void FilePointerTest( void )
// FileAttributesTest
-void verifyFileAttributes( void )
+void verifyFileAttributes()
{
FileBase::RC rc;
DirectoryItem aItem;
@@ -1144,7 +1144,7 @@ void verifyFileAttributes( void )
}
#ifdef UNX
-void FileAttributesTest( void )
+void FileAttributesTest()
{
FileBase::RC rc;
@@ -1249,7 +1249,7 @@ void FileAttributesTest( void )
#endif
#ifdef WNT
-void FileAttributesTest( void )
+void FileAttributesTest()
{
FileBase::RC rc;
@@ -1299,7 +1299,7 @@ void FileAttributesTest( void )
// FileTimeTest
-void FileTimeTest( void )
+void FileTimeTest()
{
FileBase::RC rc;
@@ -1427,7 +1427,7 @@ void FileTimeTest( void )
// DirectoryItemTest
-void DirectoryItemTest( void )
+void DirectoryItemTest()
{
FileBase::RC rc;
Directory *pDir;
@@ -1743,7 +1743,7 @@ void FileStatusTest( FileStatus *pStatus )
// DirectoryFileStatusTest
-void DirectoryFileStatusTest( void )
+void DirectoryFileStatusTest()
{
FileBase::RC rc;
DirectoryItem aItem;
@@ -1779,7 +1779,7 @@ void DirectoryFileStatusTest( void )
// FileFileStatusTest
-void FileFileStatusTest( void )
+void FileFileStatusTest()
{
FileBase::RC rc;
DirectoryItem aItem;
@@ -1815,7 +1815,7 @@ void FileFileStatusTest( void )
// VolumeFileStatusTest
-void VolumeFileStatusTest( void )
+void VolumeFileStatusTest()
{
FileBase::RC rc;
DirectoryItem aItem;
@@ -1851,7 +1851,7 @@ void VolumeFileStatusTest( void )
// VolumeInfoTest
-void VolumeInfoTest( void )
+void VolumeInfoTest()
{
FileBase::RC rc;
@@ -2070,7 +2070,7 @@ void DoAbsolutePathTest(rtl::OUString strDirBase, rtl::OUString strRelative)
return;
}
-void AbsolutePathTest(void)
+void AbsolutePathTest()
{
printf( "--------------------------------------------\n" );
printf( "AbsolutePath-Test\n" );
@@ -2092,7 +2092,7 @@ void AbsolutePathTest(void)
// searchPathTest
-void SearchPathTest(void)
+void SearchPathTest()
{
FileBase::RC rc;
@@ -2283,7 +2283,7 @@ void getCanonicalNameTest(rtl::OUString strPath)
return;
}
-void CanonicalNameTest(void)
+void CanonicalNameTest()
{
printf( "--------------------------------------------\n" );
printf( "CanonicalName-Test\n" );
diff --git a/sal/workben/testpip2.cxx b/sal/workben/testpip2.cxx
index ef567867219a..87fcd705ae71 100644
--- a/sal/workben/testpip2.cxx
+++ b/sal/workben/testpip2.cxx
@@ -38,7 +38,7 @@ void fail( const char * pszText, int retval )
* Teste die Pipe-Implementation in osl
*/
-int main (void)
+int main()
{
char szBuffer[ 256 ];
rtl_uString* ustrPipeName=0;
diff --git a/sal/workben/testproc.cxx b/sal/workben/testproc.cxx
index 928ccce60f59..3d2bd79322bf 100644
--- a/sal/workben/testproc.cxx
+++ b/sal/workben/testproc.cxx
@@ -26,7 +26,7 @@
#define MAIN main
#endif
-int MAIN (void)
+int MAIN()
{
//oslProcess Process;
sal_uInt32 nArgCount;