From b251bdd7f82e87b3ec2f5eddf9106645a91639ec Mon Sep 17 00:00:00 2001 From: Ross Bencina Date: Thu, 21 Jan 2021 23:27:43 +1100 Subject: [PATCH] Clean up whitespace in src/os/unix in preparation for .editorconfig. Convert tabs to 4 spaces. Indent by 4 spaces. Strip trailing whitespace. Ensure EOL at EOF. (#410) --- src/os/unix/pa_unix_hostapis.c | 8 ++++---- src/os/unix/pa_unix_util.c | 34 +++++++++++++++++----------------- src/os/unix/pa_unix_util.h | 6 +++--- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/os/unix/pa_unix_hostapis.c b/src/os/unix/pa_unix_hostapis.c index a9b4a05..7f1a51f 100644 --- a/src/os/unix/pa_unix_hostapis.c +++ b/src/os/unix/pa_unix_hostapis.c @@ -26,13 +26,13 @@ */ /* - * The text above constitutes the entire PortAudio license; however, + * The text above constitutes the entire PortAudio license; however, * the PortAudio community also makes the following non-binding requests: * * Any person wishing to distribute modifications to the Software is * requested to send the modifications to the original developer so that - * they can be incorporated into the canonical version. It is also - * requested that these non-binding requests be included along with the + * they can be incorporated into the canonical version. It is also + * requested that these non-binding requests be included along with the * license above. */ @@ -83,7 +83,7 @@ PaUtilHostApiInitializer *paHostApiInitializers[] = PaJack_Initialize, #endif /* Added for IRIX, Pieter, oct 2, 2003: */ -#if PA_USE_SGI +#if PA_USE_SGI PaSGI_Initialize, #endif diff --git a/src/os/unix/pa_unix_util.c b/src/os/unix/pa_unix_util.c index 5472336..a0d592d 100644 --- a/src/os/unix/pa_unix_util.c +++ b/src/os/unix/pa_unix_util.c @@ -27,20 +27,20 @@ */ /* - * The text above constitutes the entire PortAudio license; however, + * The text above constitutes the entire PortAudio license; however, * the PortAudio community also makes the following non-binding requests: * * Any person wishing to distribute modifications to the Software is * requested to send the modifications to the original developer so that - * they can be incorporated into the canonical version. It is also - * requested that these non-binding requests be included along with the + * they can be incorporated into the canonical version. It is also + * requested that these non-binding requests be included along with the * license above. */ /** @file @ingroup unix_src */ - + #include #include #include @@ -129,7 +129,7 @@ void Pa_Sleep( long msec ) /* Discussion on the CoreAudio mailing list suggests that calling gettimeofday (or anything else in the BSD layer) is not real-time - safe, so we use mach_absolute_time on OSX. This implementation is + safe, so we use mach_absolute_time on OSX. This implementation is based on these two links: Technical Q&A QA1398 - Mach Absolute Time Units @@ -140,7 +140,7 @@ void Pa_Sleep( long msec ) */ /* Scaler to convert the result of mach_absolute_time to seconds */ -static double machSecondsConversionScaler_ = 0.0; +static double machSecondsConversionScaler_ = 0.0; #endif void PaUtil_InitializeClock( void ) @@ -193,8 +193,8 @@ PaError PaUtil_CancelThreading( PaUtilThreading *threading, int wait, PaError *e if( exitResult ) *exitResult = paNoError; - /* If pthread_cancel is not supported (Android platform) whole this function can lead to indefinite waiting if - working thread (callbackThread) has'n received any stop signals from outside, please keep + /* If pthread_cancel is not supported (Android platform) whole this function can lead to indefinite waiting if + working thread (callbackThread) has'n received any stop signals from outside, please keep this in mind when considering using PaUtil_CancelThreading */ #ifdef PTHREAD_CANCELED @@ -220,7 +220,7 @@ PaError PaUtil_CancelThreading( PaUtilThreading *threading, int wait, PaError *e } /* Threading */ -/* paUnixMainThread +/* paUnixMainThread * We have to be a bit careful with defining this global variable, * as explained below. */ #ifdef __APPLE__ @@ -300,7 +300,7 @@ PaError PaUnixThread_New( PaUnixThread* self, void* (*threadFunc)( void* ), void PA_UNLESS( !pthread_attr_init( &attr ), paInternalError ); /* Priority relative to other processes */ - PA_UNLESS( !pthread_attr_setscope( &attr, PTHREAD_SCOPE_SYSTEM ), paInternalError ); + PA_UNLESS( !pthread_attr_setscope( &attr, PTHREAD_SCOPE_SYSTEM ), paInternalError ); PA_UNLESS( !pthread_create( &self->thread, &attr, threadFunc, threadArg ), paInternalError ); started = 1; @@ -350,7 +350,7 @@ PaError PaUnixThread_New( PaUnixThread* self, void* (*threadFunc)( void* ), void pthread_getschedparam(self->thread, &policy, &spm); } } - + if( self->parentWaiting ) { PaTime till; @@ -513,15 +513,15 @@ PaError PaUnixMutex_Terminate( PaUnixMutex* self ) /** Lock mutex. * - * We're disabling thread cancellation while the thread is holding a lock, so mutexes are + * We're disabling thread cancellation while the thread is holding a lock, so mutexes are * properly unlocked at termination time. */ PaError PaUnixMutex_Lock( PaUnixMutex* self ) { PaError result = paNoError; - + #ifdef PTHREAD_CANCEL - int oldState; + int oldState; PA_ENSURE_SYSTEM( pthread_setcancelstate( PTHREAD_CANCEL_DISABLE, &oldState ), 0 ); #endif PA_ENSURE_SYSTEM( pthread_mutex_lock( &self->mtx ), 0 ); @@ -540,7 +540,7 @@ PaError PaUnixMutex_Unlock( PaUnixMutex* self ) PA_ENSURE_SYSTEM( pthread_mutex_unlock( &self->mtx ), 0 ); #ifdef PTHREAD_CANCEL - int oldState; + int oldState; PA_ENSURE_SYSTEM( pthread_setcancelstate( PTHREAD_CANCEL_ENABLE, &oldState ), 0 ); #endif @@ -595,7 +595,7 @@ static void *WatchdogFunc( void *userData ) while( 1 ) { double lowpassCoeff = 0.9, lowpassCoeff1 = 0.99999 - lowpassCoeff; - + /* Test before and after in case whatever underlying sleep call isn't interrupted by pthread_cancel */ pthread_testcancel(); Pa_Sleep( intervalMsec ); @@ -680,7 +680,7 @@ error: /* Pass on error code */ pres = malloc( sizeof (PaError) ); *pres = result; - + pthread_exit( pres ); } diff --git a/src/os/unix/pa_unix_util.h b/src/os/unix/pa_unix_util.h index 2a62fe8..2228cb3 100644 --- a/src/os/unix/pa_unix_util.h +++ b/src/os/unix/pa_unix_util.h @@ -27,13 +27,13 @@ */ /* - * The text above constitutes the entire PortAudio license; however, + * The text above constitutes the entire PortAudio license; however, * the PortAudio community also makes the following non-binding requests: * * Any person wishing to distribute modifications to the Software is * requested to send the modifications to the original developer so that - * they can be incorporated into the canonical version. It is also - * requested that these non-binding requests be included along with the + * they can be incorporated into the canonical version. It is also + * requested that these non-binding requests be included along with the * license above. */ -- 2.43.0