From 71b809959bb8f775d83dc52628448bb8b8322b28 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 14 Apr 2015 12:44:47 +0200 Subject: 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 --- sal/osl/all/compat.cxx | 2 +- sal/osl/unx/mutex.cxx | 2 +- sal/osl/unx/pipe.cxx | 2 +- sal/osl/unx/process_impl.cxx | 2 +- sal/osl/unx/saltime.hxx | 2 +- sal/osl/unx/signal.cxx | 8 ++++---- sal/osl/unx/socket.cxx | 2 +- sal/osl/unx/thread.cxx | 16 ++++++++-------- sal/osl/unx/time.cxx | 2 +- sal/osl/w32/file_dirvol.cxx | 2 +- sal/osl/w32/process.cxx | 2 +- sal/osl/w32/signal.cxx | 4 ++-- sal/osl/w32/socket.cxx | 6 +++--- 13 files changed, 26 insertions(+), 26 deletions(-) (limited to 'sal/osl') 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 -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(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; -- cgit