2010-06-22 Jennifer Averett <Jennifer.Averett@OARcorp.com>

* posix/src/nanosleep.c, posix/src/timersettime.c: Removed redundent
	code and cleaned up error checking code.
This commit is contained in:
Jennifer Averett
2010-06-22 15:36:06 +00:00
parent da361aa97d
commit f5dc557118
3 changed files with 14 additions and 9 deletions
+5
View File
@@ -1,3 +1,8 @@
2010-06-22 Jennifer Averett <Jennifer.Averett@OARcorp.com>
* posix/src/nanosleep.c, posix/src/timersettime.c: Removed redundent
code and cleaned up error checking code.
2010-06-22 Sebastian Huber <sebastian.huber@embedded-brains.de>
* libcsupport/src/mount.c: Fixed string assignment in mount entry
+1 -3
View File
@@ -36,8 +36,6 @@ int nanosleep(
{
Watchdog_Interval ticks;
if ( !_Timespec_Is_valid( rqtp ) )
rtems_set_errno_and_return_minus_one( EINVAL );
/*
* Return EINVAL if the delay interval is negative.
@@ -45,7 +43,7 @@ int nanosleep(
* NOTE: This behavior is beyond the POSIX specification.
* FSU and GNU/Linux pthreads shares this behavior.
*/
if ( rqtp->tv_sec < 0 || rqtp->tv_nsec < 0 )
if ( !_Timespec_Is_valid( rqtp ) )
rtems_set_errno_and_return_minus_one( EINVAL );
ticks = _Timespec_To_ticks( rqtp );
+8 -6
View File
@@ -42,12 +42,14 @@ int timer_settime(
if ( !value )
rtems_set_errno_and_return_minus_one( EINVAL );
/* First, it verifies if the structure "value" is correct */
if ( ( value->it_value.tv_nsec >= TOD_NANOSECONDS_PER_SECOND ) ||
( value->it_value.tv_nsec < 0 ) ||
( value->it_interval.tv_nsec >= TOD_NANOSECONDS_PER_SECOND) ||
( value->it_interval.tv_nsec < 0 )) {
/* The number of nanoseconds is not correct */
/*
* First, it verifies if the structure "value" is correct
* if the number of nanoseconds is not correct return EINVAL
*/
if ( !_Timespec_Is_valid( &(value->it_value) ) ) {
rtems_set_errno_and_return_minus_one( EINVAL );
}
if ( !_Timespec_Is_valid( &(value->it_interval) ) ) {
rtems_set_errno_and_return_minus_one( EINVAL );
}