From 1de949a8bda2912d663ad3b296fec0f1a9b03c46 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Mon, 30 Nov 2009 15:49:52 +0000 Subject: Whitespace removal. --- cpukit/libgnat/ada_intrsupp.c | 10 ++--- cpukit/libnetworking/lib/tftpDriver.c | 54 ++++++++++++------------- cpukit/posix/include/rtems/posix/barrier.h | 2 +- cpukit/posix/include/rtems/posix/cancel.h | 2 +- cpukit/posix/include/rtems/posix/mqueue.h | 2 +- cpukit/posix/include/rtems/posix/priority.h | 4 +- cpukit/posix/include/rtems/posix/pthread.h | 4 +- cpukit/posix/include/rtems/posix/rwlock.h | 2 +- cpukit/posix/include/rtems/posix/spinlock.h | 2 +- cpukit/posix/include/rtems/posix/time.h | 2 +- cpukit/posix/include/rtems/posix/timer.h | 2 +- cpukit/posix/src/canceleval.c | 2 +- cpukit/posix/src/cleanuppush.c | 2 +- cpukit/posix/src/clockgetres.c | 2 +- cpukit/posix/src/clockgettime.c | 2 +- cpukit/posix/src/condget.c | 2 +- cpukit/posix/src/keycreate.c | 2 +- cpukit/posix/src/killinfo.c | 8 ++-- cpukit/posix/src/mprotect.c | 2 +- cpukit/posix/src/mqueuetimedreceive.c | 2 +- cpukit/posix/src/mqueuetimedsend.c | 2 +- cpukit/posix/src/mutexget.c | 2 +- cpukit/posix/src/mutextimedlock.c | 4 +- cpukit/posix/src/posixtimespecabsolutetimeout.c | 2 +- cpukit/posix/src/prwlockrdlock.c | 2 +- cpukit/posix/src/prwlocktimedrdlock.c | 4 +- cpukit/posix/src/prwlocktimedwrlock.c | 4 +- cpukit/posix/src/prwlocktryrdlock.c | 2 +- cpukit/posix/src/prwlocktrywrlock.c | 2 +- cpukit/posix/src/prwlockunlock.c | 2 +- cpukit/posix/src/prwlockwrlock.c | 2 +- cpukit/posix/src/psignalclearsignals.c | 2 +- cpukit/posix/src/psignalunblockthread.c | 4 +- cpukit/posix/src/pspininit.c | 2 +- cpukit/posix/src/psxtransschedparam.c | 2 +- cpukit/posix/src/pthreadcreate.c | 2 +- cpukit/posix/src/pthreadexit.c | 6 +-- cpukit/posix/src/semtimedwait.c | 2 +- cpukit/posix/src/setcanceltype.c | 2 +- cpukit/posix/src/sigtimedwait.c | 2 +- cpukit/posix/src/sysconf.c | 2 +- cpukit/posix/src/timercreate.c | 4 +- cpukit/posix/src/timersettime.c | 10 ++--- cpukit/posix/src/ualarm.c | 6 +-- 44 files changed, 92 insertions(+), 92 deletions(-) diff --git a/cpukit/libgnat/ada_intrsupp.c b/cpukit/libgnat/ada_intrsupp.c index 9bec384127..8cb4ab339f 100644 --- a/cpukit/libgnat/ada_intrsupp.c +++ b/cpukit/libgnat/ada_intrsupp.c @@ -13,7 +13,7 @@ rtems_id __gnat_binary_semaphore_create(void) 0, &semaphore ); - if ( status != RTEMS_SUCCESSFUL ) + if ( status != RTEMS_SUCCESSFUL ) printk( "__gnat_binary_semaphore_create failed %d\n", status ); #if defined(GNAT_DEBUG) @@ -33,7 +33,7 @@ int __gnat_binary_semaphore_delete( #endif status = rtems_semaphore_delete( semaphore ); - if ( status != RTEMS_SUCCESSFUL ) + if ( status != RTEMS_SUCCESSFUL ) printk( "__gnat_binary_semaphore_delete failed %d\n", status ); return 0; @@ -50,7 +50,7 @@ int __gnat_binary_semaphore_obtain( #endif status = rtems_semaphore_obtain( semaphore, RTEMS_WAIT, RTEMS_NO_TIMEOUT ); - if ( status != RTEMS_SUCCESSFUL ) + if ( status != RTEMS_SUCCESSFUL ) printk( "__gnat_binary_semaphore_obtain failed %d\n", status ); return 0; @@ -67,7 +67,7 @@ int __gnat_binary_semaphore_release( #endif status = rtems_semaphore_release( semaphore ); - if ( status != RTEMS_SUCCESSFUL ) + if ( status != RTEMS_SUCCESSFUL ) printk( "__gnat_binary_semaphore_release failed %d\n", status ); return 0; @@ -82,7 +82,7 @@ int __gnat_binary_semaphore_flush( printk( "__gnat_binary_semaphore_flush\n" ); status = rtems_semaphore_flush( semaphore ); - if ( status != RTEMS_SUCCESSFUL ) + if ( status != RTEMS_SUCCESSFUL ) printk( "__gnat_binary_semaphore_flush failed %d\n", status ); return 0; diff --git a/cpukit/libnetworking/lib/tftpDriver.c b/cpukit/libnetworking/lib/tftpDriver.c index 289418f69c..b84da7925d 100644 --- a/cpukit/libnetworking/lib/tftpDriver.c +++ b/cpukit/libnetworking/lib/tftpDriver.c @@ -200,7 +200,7 @@ static int rtems_tftp_mount_me( * These need to be looked at for full POSIX semantics. */ - temp_mt_entry->pathconf_limits_and_options = rtems_tftp_limits_and_options; + temp_mt_entry->pathconf_limits_and_options = rtems_tftp_limits_and_options; /* @@ -208,7 +208,7 @@ static int rtems_tftp_mount_me( * * NOTE: This could be in an fsinfo for this filesystem type. */ - + sc = rtems_semaphore_create ( rtems_build_name('T', 'F', 'T', 'P'), 1, @@ -222,7 +222,7 @@ static int rtems_tftp_mount_me( ); if (sc != RTEMS_SUCCESSFUL) - rtems_set_errno_and_return_minus_one( ENOMEM ); + rtems_set_errno_and_return_minus_one( ENOMEM ); return 0; } @@ -231,16 +231,16 @@ static int rtems_tftp_mount_me( * Initialize the TFTP driver */ -int rtems_bsdnet_initialize_tftp_filesystem (void) +int rtems_bsdnet_initialize_tftp_filesystem (void) { int status; rtems_filesystem_mount_table_entry_t *entry; status = mkdir( TFTP_PATHNAME_PREFIX, S_IRWXU | S_IRWXG | S_IRWXO ); if ( status == -1 ) - return status; + return status; - status = mount( + status = mount( &entry, &rtems_tftp_ops, RTEMS_FILESYSTEM_READ_WRITE, @@ -298,7 +298,7 @@ sendStifle (struct tftpStream *tp, struct sockaddr_in *to) msg.opcode = htons (TFTP_OPCODE_ERROR); msg.errorCode = htons (5); len = sizeof msg.opcode + sizeof msg.errorCode + 1; - len += sprintf (msg.errorMessage, "GO AWAY"); + len += sprintf (msg.errorMessage, "GO AWAY"); /* * Send it @@ -340,7 +340,7 @@ getPacket (struct tftpStream *tp, int retryCount) tp->firstReply = 0; tp->farAddress.sin_port = from.i.sin_port; } - if (tp->farAddress.sin_port == from.i.sin_port) + if (tp->farAddress.sin_port == from.i.sin_port) break; } @@ -423,9 +423,9 @@ static int rtems_tftp_evaluate_for_make( rtems_filesystem_location_info_t *pathloc, /* IN/OUT */ const char **name __attribute__((unused)) /* OUT */ ) -{ +{ pathloc->node_access = NULL; - rtems_set_errno_and_return_minus_one( EIO ); + rtems_set_errno_and_return_minus_one( EIO ); } /* @@ -482,7 +482,7 @@ fixPath (char *path) return; } -static int rtems_tftp_eval_path( +static int rtems_tftp_eval_path( const char *pathname, /* IN */ int pathnamelen, /* IN */ int flags, /* IN */ @@ -498,7 +498,7 @@ static int rtems_tftp_eval_path( if (pathname[strlen(pathname)-1] == '/') { int isRelative = (pathloc->node_access != ROOT_NODE_ACCESS); char *cp; - + /* * Reject attempts to open() directories */ @@ -581,18 +581,18 @@ static int rtems_tftp_open_worker( /* * Extract file pathname component */ - while (*cp2 == '/') + while (*cp2 == '/') cp2++; if (strcmp (cp2, "BOOTP_FILE") == 0) { cp2 = rtems_bsdnet_bootp_boot_file_name; - while (*cp2 == '/') + while (*cp2 == '/') cp2++; } if (*cp2 == '\0') return ENOENT; remoteFilename = cp2; if (strlen (remoteFilename) > (TFTP_BUFSIZE - 10)) - return ENOENT; + return ENOENT; /* * Find a free stream @@ -690,7 +690,7 @@ static int rtems_tftp_open_worker( /* * Send the request */ - if (sendto (tp->socket, (char *)&tp->pkbuf, len, 0, + if (sendto (tp->socket, (char *)&tp->pkbuf, len, 0, (struct sockaddr *)&tp->farAddress, sizeof tp->farAddress) < 0) { close (tp->socket); @@ -876,7 +876,7 @@ static int rtems_tftp_flush ( struct tftpStream *tp ) if (rtems_tftp_driver_debug) printf ("TFTP: SEND %d (%d)\n", tp->blocknum, tp->nused); #endif - if (sendto (tp->socket, (char *)&tp->pkbuf, wlen, 0, + if (sendto (tp->socket, (char *)&tp->pkbuf, wlen, 0, (struct sockaddr *)&tp->farAddress, sizeof tp->farAddress) < 0) return EIO; @@ -1029,19 +1029,19 @@ rtems_filesystem_operations_table rtems_tftp_ops = { NULL, /* symlink */ NULL, /* readlin */ }; - + rtems_filesystem_file_handlers_r rtems_tftp_handlers = { - rtems_tftp_open, /* open */ - rtems_tftp_close, /* close */ - rtems_tftp_read, /* read */ - rtems_tftp_write, /* write */ - NULL, /* ioctl */ - NULL, /* lseek */ - NULL, /* fstat */ - NULL, /* fchmod */ + rtems_tftp_open, /* open */ + rtems_tftp_close, /* close */ + rtems_tftp_read, /* read */ + rtems_tftp_write, /* write */ + NULL, /* ioctl */ + NULL, /* lseek */ + NULL, /* fstat */ + NULL, /* fchmod */ rtems_tftp_ftruncate, /* ftruncate */ NULL, /* fpathconf */ - NULL, /* fsync */ + NULL, /* fsync */ NULL, /* fdatasync */ NULL, /* fcntl */ NULL /* rmnod */ diff --git a/cpukit/posix/include/rtems/posix/barrier.h b/cpukit/posix/include/rtems/posix/barrier.h index d880ba33c0..6bb2aa2e5c 100644 --- a/cpukit/posix/include/rtems/posix/barrier.h +++ b/cpukit/posix/include/rtems/posix/barrier.h @@ -70,7 +70,7 @@ void _POSIX_Barrier_Manager_initialization(void); * * @param[in] the_barrier_status is the SuperCore status. * - * @return the corresponding POSIX status + * @return the corresponding POSIX status */ int _POSIX_Barrier_Translate_core_barrier_return_code( CORE_barrier_Status the_barrier_status diff --git a/cpukit/posix/include/rtems/posix/cancel.h b/cpukit/posix/include/rtems/posix/cancel.h index 04f13cea11..6e6b32a71c 100644 --- a/cpukit/posix/include/rtems/posix/cancel.h +++ b/cpukit/posix/include/rtems/posix/cancel.h @@ -49,7 +49,7 @@ void _POSIX_Threads_cancel_run( /** * @brief _POSIX_Thread_Evaluate_cancellation_and_enable_dispatch * - * This routine separates a piece of code that existed as part of + * This routine separates a piece of code that existed as part of * another routine, but had to be separated to improve coverage. * * @param[in] the_thread is the thread to evaluate canceling diff --git a/cpukit/posix/include/rtems/posix/mqueue.h b/cpukit/posix/include/rtems/posix/mqueue.h index e2e2e6fb73..325b03496d 100644 --- a/cpukit/posix/include/rtems/posix/mqueue.h +++ b/cpukit/posix/include/rtems/posix/mqueue.h @@ -4,7 +4,7 @@ * This include file contains all the private support information for * POSIX Message Queues. */ - + /* * COPYRIGHT (c) 1989-2008. * On-Line Applications Research Corporation (OAR). diff --git a/cpukit/posix/include/rtems/posix/priority.h b/cpukit/posix/include/rtems/posix/priority.h index 8e5fb02634..5944c4e7c3 100644 --- a/cpukit/posix/include/rtems/posix/priority.h +++ b/cpukit/posix/include/rtems/posix/priority.h @@ -67,7 +67,7 @@ bool _POSIX_Priority_Is_valid( * @param[in] priority is the POSIX API priority. * * @return This method returns the corresponding SuperCore priority. - */ + */ RTEMS_INLINE_ROUTINE Priority_Control _POSIX_Priority_To_core( int priority ); @@ -81,7 +81,7 @@ RTEMS_INLINE_ROUTINE Priority_Control _POSIX_Priority_To_core( * @param[in] priority is the POSIX API priority. * * @return This method returns the corresponding POSIX priority. - */ + */ RTEMS_INLINE_ROUTINE int _POSIX_Priority_From_core( Priority_Control priority ); diff --git a/cpukit/posix/include/rtems/posix/pthread.h b/cpukit/posix/include/rtems/posix/pthread.h index 66f3ab9f6d..176a408d68 100644 --- a/cpukit/posix/include/rtems/posix/pthread.h +++ b/cpukit/posix/include/rtems/posix/pthread.h @@ -46,7 +46,7 @@ extern const pthread_attr_t _POSIX_Threads_Default_attributes; /** * When the user configures a set of POSIX API initialization threads, * This variable will point to the method used to initialize them. - * + * * @note It is instantiated and initialized by confdefs.h based upon * application requirements. */ @@ -95,7 +95,7 @@ RTEMS_INLINE_ROUTINE void _POSIX_Threads_Free( * @param[in] id is the id to lookup * @param[in] location points to the returned location value * - * @return This methods returns a pointer to the corresponding Thread_Control. + * @return This methods returns a pointer to the corresponding Thread_Control. */ RTEMS_INLINE_ROUTINE Thread_Control *_POSIX_Threads_Get( pthread_t id, diff --git a/cpukit/posix/include/rtems/posix/rwlock.h b/cpukit/posix/include/rtems/posix/rwlock.h index 5cc2707764..2774e02379 100644 --- a/cpukit/posix/include/rtems/posix/rwlock.h +++ b/cpukit/posix/include/rtems/posix/rwlock.h @@ -70,7 +70,7 @@ void _POSIX_RWLock_Manager_initialization(void); * * @param[in] the_RWLock_status is the SuperCore status. * - * @return the corresponding POSIX status + * @return the corresponding POSIX status */ int _POSIX_RWLock_Translate_core_RWLock_return_code( CORE_RWLock_Status the_RWLock_status diff --git a/cpukit/posix/include/rtems/posix/spinlock.h b/cpukit/posix/include/rtems/posix/spinlock.h index c96f5ced85..cf6cb6fbd2 100644 --- a/cpukit/posix/include/rtems/posix/spinlock.h +++ b/cpukit/posix/include/rtems/posix/spinlock.h @@ -70,7 +70,7 @@ void _POSIX_Spinlock_Manager_initialization(void); * * @param[in] the_spinlock_status is the SuperCore status. * - * @return the corresponding POSIX status + * @return the corresponding POSIX status */ int _POSIX_Spinlock_Translate_core_spinlock_return_code( CORE_spinlock_Status the_spinlock_status diff --git a/cpukit/posix/include/rtems/posix/time.h b/cpukit/posix/include/rtems/posix/time.h index 947f7795d6..93e3af0f44 100644 --- a/cpukit/posix/include/rtems/posix/time.h +++ b/cpukit/posix/include/rtems/posix/time.h @@ -48,7 +48,7 @@ typedef enum { * * @return This method returns the number of ticks in @a ticks_out * and a status value indicating whether the absolute time - * is valid, in the past, equal to the current time or in + * is valid, in the past, equal to the current time or in * the future as it should be. */ POSIX_Absolute_timeout_conversion_results_t _POSIX_Absolute_timeout_to_ticks( diff --git a/cpukit/posix/include/rtems/posix/timer.h b/cpukit/posix/include/rtems/posix/timer.h index f256765145..d7633db531 100644 --- a/cpukit/posix/include/rtems/posix/timer.h +++ b/cpukit/posix/include/rtems/posix/timer.h @@ -25,7 +25,7 @@ extern "C" { /* Timer is free */ #define POSIX_TIMER_STATE_FREE 0x01 - + /* Created timer but not running */ #define POSIX_TIMER_STATE_CREATE_NEW 0x02 diff --git a/cpukit/posix/src/canceleval.c b/cpukit/posix/src/canceleval.c index 3903ca1b1d..f2e6d9c4c8 100644 --- a/cpukit/posix/src/canceleval.c +++ b/cpukit/posix/src/canceleval.c @@ -34,5 +34,5 @@ void _POSIX_Thread_Evaluate_cancellation_and_enable_dispatch( _POSIX_Thread_Exit( the_thread, PTHREAD_CANCELED ); } else _Thread_Enable_dispatch(); - + } diff --git a/cpukit/posix/src/cleanuppush.c b/cpukit/posix/src/cleanuppush.c index 557b3e2d62..71079200ef 100644 --- a/cpukit/posix/src/cleanuppush.c +++ b/cpukit/posix/src/cleanuppush.c @@ -41,7 +41,7 @@ void pthread_cleanup_push( /* * The POSIX standard does not address what to do when the routine - * is NULL. It also does not address what happens when we cannot + * is NULL. It also does not address what happens when we cannot * allocate memory or anything else bad happens. */ if ( !routine ) diff --git a/cpukit/posix/src/clockgetres.c b/cpukit/posix/src/clockgetres.c index c8cdd62f5d..7507bee614 100644 --- a/cpukit/posix/src/clockgetres.c +++ b/cpukit/posix/src/clockgetres.c @@ -53,7 +53,7 @@ int clock_getres( if ( res ) { res->tv_sec = rtems_configuration_get_microseconds_per_tick() / TOD_MICROSECONDS_PER_SECOND; - res->tv_nsec = rtems_configuration_get_nanoseconds_per_tick(); + res->tv_nsec = rtems_configuration_get_nanoseconds_per_tick(); } break; diff --git a/cpukit/posix/src/clockgettime.c b/cpukit/posix/src/clockgettime.c index 8182f8e70f..852ac8e039 100644 --- a/cpukit/posix/src/clockgettime.c +++ b/cpukit/posix/src/clockgettime.c @@ -58,7 +58,7 @@ int clock_gettime( if ( clock_id == CLOCK_THREAD_CPUTIME ) rtems_set_errno_and_return_minus_one( ENOSYS ); #endif - + rtems_set_errno_and_return_minus_one( EINVAL ); return 0; diff --git a/cpukit/posix/src/condget.c b/cpukit/posix/src/condget.c index 7a0a8bed85..0305b45e3b 100644 --- a/cpukit/posix/src/condget.c +++ b/cpukit/posix/src/condget.c @@ -57,4 +57,4 @@ POSIX_Condition_variables_Control *_POSIX_Condition_variables_Get ( location ); } - + diff --git a/cpukit/posix/src/keycreate.c b/cpukit/posix/src/keycreate.c index fdaa5f096d..a9f9634677 100644 --- a/cpukit/posix/src/keycreate.c +++ b/cpukit/posix/src/keycreate.c @@ -72,7 +72,7 @@ int pthread_key_create( true, INTERNAL_ERROR_IMPLEMENTATION_KEY_CREATE_INCONSISTENCY ); - #endif + #endif bytes_to_allocate = sizeof( void * ) * (_Objects_Information_table[ the_api ][ 1 ]->maximum + 1); table = _Workspace_Allocate( bytes_to_allocate ); diff --git a/cpukit/posix/src/killinfo.c b/cpukit/posix/src/killinfo.c index 7c0f38e95a..7ab9beb78a 100644 --- a/cpukit/posix/src/killinfo.c +++ b/cpukit/posix/src/killinfo.c @@ -145,7 +145,7 @@ int killinfo( api = the_thread->API_Extensions[ THREAD_API_POSIX ]; #if defined(DEBUG_SIGNAL_PROCESSING) - printk( "Waiting Thread=%p option=0x%08x mask=0x%08x blocked=0x%08x\n", + printk( "Waiting Thread=%p option=0x%08x mask=0x%08x blocked=0x%08x\n", the_thread, the_thread->Wait.option, mask, api->signals_blocked); #endif @@ -212,8 +212,8 @@ int killinfo( #if defined(DEBUG_SIGNAL_PROCESSING) printk("\n 0x%08x/0x%08x %d/%d 0x%08x 1", - the_thread->Object.id, - ((interested) ? interested->Object.id : 0), + the_thread->Object.id, + ((interested) ? interested->Object.id : 0), the_thread->current_priority, interested_priority, the_thread->current_state ); @@ -273,7 +273,7 @@ int killinfo( interested_priority = the_thread->current_priority; continue; } - + DEBUG_STEP("6"); /* prefer blocked/interruptible over blocked/not interruptible */ if ( !_States_Is_interruptible_by_signal(interested->current_state) ) { diff --git a/cpukit/posix/src/mprotect.c b/cpukit/posix/src/mprotect.c index 265b8a80d0..d3fa8bf9c9 100644 --- a/cpukit/posix/src/mprotect.c +++ b/cpukit/posix/src/mprotect.c @@ -23,7 +23,7 @@ * gcc 2.8.1 plus gnat 3.13p and gcc 3.0.1 require it to be there and * return 0. * - * As of gcc 4.2.2, the gcc SPARC backend doesn't appear to have a + * As of gcc 4.2.2, the gcc SPARC backend doesn't appear to have a * way to call this for RTEMS anymore but it doesn't hurt to leave it. */ diff --git a/cpukit/posix/src/mqueuetimedreceive.c b/cpukit/posix/src/mqueuetimedreceive.c index 62a5abe339..678d364cdf 100644 --- a/cpukit/posix/src/mqueuetimedreceive.c +++ b/cpukit/posix/src/mqueuetimedreceive.c @@ -69,7 +69,7 @@ ssize_t mq_timedreceive( * then we do a polling operation and convert the UNSATISFIED * status into the appropriate error. * - * If the status is POSIX_ABSOLUTE_TIMEOUT_INVALID, + * If the status is POSIX_ABSOLUTE_TIMEOUT_INVALID, * POSIX_ABSOLUTE_TIMEOUT_IS_IN_PAST, or POSIX_ABSOLUTE_TIMEOUT_IS_NOW, * then we should not wait. */ diff --git a/cpukit/posix/src/mqueuetimedsend.c b/cpukit/posix/src/mqueuetimedsend.c index 8b8016fbfe..9048e8f077 100644 --- a/cpukit/posix/src/mqueuetimedsend.c +++ b/cpukit/posix/src/mqueuetimedsend.c @@ -69,7 +69,7 @@ int mq_timedsend( * then we do a polling operation and convert the UNSATISFIED * status into the appropriate error. * - * If the status is POSIX_ABSOLUTE_TIMEOUT_INVALID, + * If the status is POSIX_ABSOLUTE_TIMEOUT_INVALID, * POSIX_ABSOLUTE_TIMEOUT_IS_IN_PAST, or POSIX_ABSOLUTE_TIMEOUT_IS_NOW, * then we should not wait. */ diff --git a/cpukit/posix/src/mutexget.c b/cpukit/posix/src/mutexget.c index 7dec12bb10..71e46766ba 100644 --- a/cpukit/posix/src/mutexget.c +++ b/cpukit/posix/src/mutexget.c @@ -58,7 +58,7 @@ } \ } \ } while (0) - + POSIX_Mutex_Control *_POSIX_Mutex_Get ( pthread_mutex_t *mutex, Objects_Locations *location diff --git a/cpukit/posix/src/mutextimedlock.c b/cpukit/posix/src/mutextimedlock.c index ca7d7091c1..f1d4dcee08 100644 --- a/cpukit/posix/src/mutextimedlock.c +++ b/cpukit/posix/src/mutextimedlock.c @@ -56,7 +56,7 @@ int pthread_mutex_timedlock( * then we do a polling operation and convert the UNSATISFIED * status into the appropriate error. * - * If the status is POSIX_ABSOLUTE_TIMEOUT_INVALID, + * If the status is POSIX_ABSOLUTE_TIMEOUT_INVALID, * POSIX_ABSOLUTE_TIMEOUT_IS_IN_PAST, or POSIX_ABSOLUTE_TIMEOUT_IS_NOW, * then we should not wait. */ @@ -64,7 +64,7 @@ int pthread_mutex_timedlock( if ( status != POSIX_ABSOLUTE_TIMEOUT_IS_IN_FUTURE ) do_wait = false; - lock_status = _POSIX_Mutex_Lock_support( mutex, do_wait, ticks ); + lock_status = _POSIX_Mutex_Lock_support( mutex, do_wait, ticks ); /* * This service only gives us the option to block. We used a polling * attempt to lock if the abstime was not in the future. If we did diff --git a/cpukit/posix/src/posixtimespecabsolutetimeout.c b/cpukit/posix/src/posixtimespecabsolutetimeout.c index 036fd9ee8b..27d5db5abe 100644 --- a/cpukit/posix/src/posixtimespecabsolutetimeout.c +++ b/cpukit/posix/src/posixtimespecabsolutetimeout.c @@ -42,7 +42,7 @@ POSIX_Absolute_timeout_conversion_results_t _POSIX_Absolute_timeout_to_ticks( struct timespec current_time; struct timespec difference; - + /* * Make sure there is always a value returned. */ diff --git a/cpukit/posix/src/prwlockrdlock.c b/cpukit/posix/src/prwlockrdlock.c index ccc3b63c8e..fe9d6196d9 100644 --- a/cpukit/posix/src/prwlockrdlock.c +++ b/cpukit/posix/src/prwlockrdlock.c @@ -40,7 +40,7 @@ int pthread_rwlock_rdlock( { POSIX_RWLock_Control *the_rwlock; Objects_Locations location; - + if ( !rwlock ) return EINVAL; diff --git a/cpukit/posix/src/prwlocktimedrdlock.c b/cpukit/posix/src/prwlocktimedrdlock.c index 3879af758b..547fa533e5 100644 --- a/cpukit/posix/src/prwlocktimedrdlock.c +++ b/cpukit/posix/src/prwlocktimedrdlock.c @@ -45,7 +45,7 @@ int pthread_rwlock_timedrdlock( Watchdog_Interval ticks; bool do_wait = true; POSIX_Absolute_timeout_conversion_results_t status; - + if ( !rwlock ) return EINVAL; @@ -58,7 +58,7 @@ int pthread_rwlock_timedrdlock( * then we do a polling operation and convert the UNSATISFIED * status into the appropriate error. * - * If the status is POSIX_ABSOLUTE_TIMEOUT_INVALID, + * If the status is POSIX_ABSOLUTE_TIMEOUT_INVALID, * POSIX_ABSOLUTE_TIMEOUT_IS_IN_PAST, or POSIX_ABSOLUTE_TIMEOUT_IS_NOW, * then we should not wait. */ diff --git a/cpukit/posix/src/prwlocktimedwrlock.c b/cpukit/posix/src/prwlocktimedwrlock.c index bb45b1d669..1571e86f86 100644 --- a/cpukit/posix/src/prwlocktimedwrlock.c +++ b/cpukit/posix/src/prwlocktimedwrlock.c @@ -45,7 +45,7 @@ int pthread_rwlock_timedwrlock( Watchdog_Interval ticks; bool do_wait = true; POSIX_Absolute_timeout_conversion_results_t status; - + if ( !rwlock ) return EINVAL; @@ -58,7 +58,7 @@ int pthread_rwlock_timedwrlock( * then we do a polling operation and convert the UNSATISFIED * status into the appropriate error. * - * If the status is POSIX_ABSOLUTE_TIMEOUT_INVALID, + * If the status is POSIX_ABSOLUTE_TIMEOUT_INVALID, * POSIX_ABSOLUTE_TIMEOUT_IS_IN_PAST, or POSIX_ABSOLUTE_TIMEOUT_IS_NOW, * then we should not wait. */ diff --git a/cpukit/posix/src/prwlocktryrdlock.c b/cpukit/posix/src/prwlocktryrdlock.c index 9e227f9fcb..f07edf5f4d 100644 --- a/cpukit/posix/src/prwlocktryrdlock.c +++ b/cpukit/posix/src/prwlocktryrdlock.c @@ -40,7 +40,7 @@ int pthread_rwlock_tryrdlock( { POSIX_RWLock_Control *the_rwlock; Objects_Locations location; - + if ( !rwlock ) return EINVAL; diff --git a/cpukit/posix/src/prwlocktrywrlock.c b/cpukit/posix/src/prwlocktrywrlock.c index cf8c8c0fc3..326e643910 100644 --- a/cpukit/posix/src/prwlocktrywrlock.c +++ b/cpukit/posix/src/prwlocktrywrlock.c @@ -40,7 +40,7 @@ int pthread_rwlock_trywrlock( { POSIX_RWLock_Control *the_rwlock; Objects_Locations location; - + if ( !rwlock ) return EINVAL; diff --git a/cpukit/posix/src/prwlockunlock.c b/cpukit/posix/src/prwlockunlock.c index a316b9ef1a..665ee1fb34 100644 --- a/cpukit/posix/src/prwlockunlock.c +++ b/cpukit/posix/src/prwlockunlock.c @@ -41,7 +41,7 @@ int pthread_rwlock_unlock( POSIX_RWLock_Control *the_rwlock; Objects_Locations location; CORE_RWLock_Status status; - + if ( !rwlock ) return EINVAL; diff --git a/cpukit/posix/src/prwlockwrlock.c b/cpukit/posix/src/prwlockwrlock.c index d6294b030d..61d5facbef 100644 --- a/cpukit/posix/src/prwlockwrlock.c +++ b/cpukit/posix/src/prwlockwrlock.c @@ -40,7 +40,7 @@ int pthread_rwlock_wrlock( { POSIX_RWLock_Control *the_rwlock; Objects_Locations location; - + if ( !rwlock ) return EINVAL; diff --git a/cpukit/posix/src/psignalclearsignals.c b/cpukit/posix/src/psignalclearsignals.c index 4143d53ec9..09942f3bb5 100644 --- a/cpukit/posix/src/psignalclearsignals.c +++ b/cpukit/posix/src/psignalclearsignals.c @@ -61,7 +61,7 @@ bool _POSIX_signals_Clear_signals( else signals_blocked = SIGNAL_ALL_MASK; - /* XXX is this right for siginfo type signals? */ + /* XXX is this right for siginfo type signals? */ /* XXX are we sure they can be cleared the same way? */ _ISR_Disable( level ); diff --git a/cpukit/posix/src/psignalunblockthread.c b/cpukit/posix/src/psignalunblockthread.c index c7d1c80266..fdba79a00c 100644 --- a/cpukit/posix/src/psignalunblockthread.c +++ b/cpukit/posix/src/psignalunblockthread.c @@ -91,13 +91,13 @@ bool _POSIX_signals_Unblock_thread( * + If it is blocked on an interruptible signal, THEN * we unblock the thread. * + If it is in the ready state AND - * we are sending from an ISR AND + * we are sending from an ISR AND * it is the interrupted thread AND * it is not blocked, THEN * we need to dispatch at the end of this ISR. * + Any other combination, do nothing. */ - + the_thread->do_post_task_switch_extension = true; if ( the_thread->current_state & STATES_INTERRUPTIBLE_BY_SIGNAL ) { diff --git a/cpukit/posix/src/pspininit.c b/cpukit/posix/src/pspininit.c index 6a0f707609..4fc9d12d8f 100644 --- a/cpukit/posix/src/pspininit.c +++ b/cpukit/posix/src/pspininit.c @@ -43,7 +43,7 @@ int pthread_spin_init( { POSIX_Spinlock_Control *the_spinlock; CORE_spinlock_Attributes attributes; - + if ( !spinlock ) return EINVAL; diff --git a/cpukit/posix/src/psxtransschedparam.c b/cpukit/posix/src/psxtransschedparam.c index 415e807d4c..2ba1547ec0 100644 --- a/cpukit/posix/src/psxtransschedparam.c +++ b/cpukit/posix/src/psxtransschedparam.c @@ -63,7 +63,7 @@ int _POSIX_Thread_Translate_sched_param( if ( !_POSIX_Priority_Is_valid( param->ss_low_priority ) ) return EINVAL; - + *budget_algorithm = THREAD_CPU_BUDGET_ALGORITHM_CALLOUT; *budget_callout = _POSIX_Threads_Sporadic_budget_callout; return 0; diff --git a/cpukit/posix/src/pthreadcreate.c b/cpukit/posix/src/pthreadcreate.c index b17da6b9ba..ed9557ce67 100644 --- a/cpukit/posix/src/pthreadcreate.c +++ b/cpukit/posix/src/pthreadcreate.c @@ -212,7 +212,7 @@ int pthread_create( #if defined(RTEMS_DEBUG) /* * _Thread_Start only fails if the thread was in the incorrect state - * + * * NOTE: This can only happen if someone slips in and touches the * thread while we are creating it. */ diff --git a/cpukit/posix/src/pthreadexit.c b/cpukit/posix/src/pthreadexit.c index c5eda2e02c..9efe9d9a47 100644 --- a/cpukit/posix/src/pthreadexit.c +++ b/cpukit/posix/src/pthreadexit.c @@ -35,17 +35,17 @@ void _POSIX_Thread_Exit( the_information = _Objects_Get_information_id( the_thread->Object.id ); /* - * The_information has to be non-NULL. Otherwise, we couldn't be + * The_information has to be non-NULL. Otherwise, we couldn't be * running in a thread of this API and class. * * NOTE: Lock and unlock in different order so we do not throw a * fatal error when locking the allocator mutex. And after * we unlock, we want to defer the context switch until we * are ready to be switched out. Otherwise, an ISR could - * occur and preempt us out while we still hold the + * occur and preempt us out while we still hold the * allocator mutex. */ - + _RTEMS_Lock_allocator(); _Thread_Disable_dispatch(); diff --git a/cpukit/posix/src/semtimedwait.c b/cpukit/posix/src/semtimedwait.c index 33c38ddbd0..58d3bcea09 100644 --- a/cpukit/posix/src/semtimedwait.c +++ b/cpukit/posix/src/semtimedwait.c @@ -53,7 +53,7 @@ int sem_timedwait( * then we do a polling operation and convert the UNSATISFIED * status into the appropriate error. * - * If the status is POSIX_ABSOLUTE_TIMEOUT_INVALID, + * If the status is POSIX_ABSOLUTE_TIMEOUT_INVALID, * POSIX_ABSOLUTE_TIMEOUT_IS_IN_PAST, or POSIX_ABSOLUTE_TIMEOUT_IS_NOW, * then we should not wait. */ diff --git a/cpukit/posix/src/setcanceltype.c b/cpukit/posix/src/setcanceltype.c index 224a8fb11d..85f645bad4 100644 --- a/cpukit/posix/src/setcanceltype.c +++ b/cpukit/posix/src/setcanceltype.c @@ -57,7 +57,7 @@ int pthread_setcanceltype( thread_support->cancelability_type = type; _POSIX_Thread_Evaluate_cancellation_and_enable_dispatch(_Thread_Executing); - + /* * _Thread_Enable_dispatch is invoked by above call. */ diff --git a/cpukit/posix/src/sigtimedwait.c b/cpukit/posix/src/sigtimedwait.c index ab53bde1d4..70b632b6de 100644 --- a/cpukit/posix/src/sigtimedwait.c +++ b/cpukit/posix/src/sigtimedwait.c @@ -79,7 +79,7 @@ int sigtimedwait( */ if ( !set ) rtems_set_errno_and_return_minus_one( EINVAL ); - + /* NOTE: This is very specifically a RELATIVE not ABSOLUTE time * in the Open Group specification. */ diff --git a/cpukit/posix/src/sysconf.c b/cpukit/posix/src/sysconf.c index 2d47c52ad2..97a774da25 100644 --- a/cpukit/posix/src/sysconf.c +++ b/cpukit/posix/src/sysconf.c @@ -42,7 +42,7 @@ long sysconf( if ( name == _SC_GETPW_R_SIZE_MAX ) return 1024; - + if ( name == _SC_PAGESIZE ) return PAGE_SIZE; diff --git a/cpukit/posix/src/timercreate.c b/cpukit/posix/src/timercreate.c index da4fe3641c..1d843580ba 100644 --- a/cpukit/posix/src/timercreate.c +++ b/cpukit/posix/src/timercreate.c @@ -36,10 +36,10 @@ int timer_create( if ( clock_id != CLOCK_REALTIME ) rtems_set_errno_and_return_minus_one( EINVAL ); - + if ( !timerid ) rtems_set_errno_and_return_minus_one( EINVAL ); - + /* * The data of the structure evp are checked in order to verify if they * are coherent. diff --git a/cpukit/posix/src/timersettime.c b/cpukit/posix/src/timersettime.c index eb7738a5b9..d7f9176a10 100644 --- a/cpukit/posix/src/timersettime.c +++ b/cpukit/posix/src/timersettime.c @@ -50,7 +50,7 @@ int timer_settime( /* The number of nanoseconds is not correct */ rtems_set_errno_and_return_minus_one( EINVAL ); } - + if ( flags != TIMER_ABSTIME && flags != POSIX_TIMER_RELATIVE ) { rtems_set_errno_and_return_minus_one( EINVAL ); } @@ -62,8 +62,8 @@ int timer_settime( struct timespec now; _TOD_Get( &now ); /* Check for seconds in the past */ - if ( _Timespec_Greater_than( &now, &normalize.it_value ) ) - rtems_set_errno_and_return_minus_one( EINVAL ); + if ( _Timespec_Greater_than( &now, &normalize.it_value ) ) + rtems_set_errno_and_return_minus_one( EINVAL ); _Timespec_Subtract( &now, &normalize.it_value, &normalize.it_value ); } @@ -95,8 +95,8 @@ int timer_settime( /* Convert from seconds and nanoseconds to ticks */ ptimer->ticks = _Timespec_To_ticks( &value->it_interval ); initial_period = _Timespec_To_ticks( &normalize.it_value ); - - + + activated = _POSIX_Timer_Insert_helper( &ptimer->Timer, initial_period, diff --git a/cpukit/posix/src/ualarm.c b/cpukit/posix/src/ualarm.c index 8910dac217..6b07ff4f31 100644 --- a/cpukit/posix/src/ualarm.c +++ b/cpukit/posix/src/ualarm.c @@ -40,10 +40,10 @@ void _POSIX_signals_Ualarm_TSR( * It's OK, there isn't a way this should fail. */ (void) kill( getpid(), SIGALRM ); - + /* * If the reset interval is non-zero, reschedule ourselves. - */ + */ _Watchdog_Reset( &_POSIX_signals_Ualarm_timer ); } @@ -98,7 +98,7 @@ useconds_t ualarm( tp.tv_nsec = (useconds % TOD_MICROSECONDS_PER_SECOND) * 1000; ticks = _Timespec_To_ticks( &tp ); if ( ticks == 0 ) - ticks = 1; + ticks = 1; _Watchdog_Insert_ticks( the_timer, _Timespec_To_ticks( &tp ) ); } -- cgit v1.2.3