Changeset 9a5cbef0 in rtems

Timestamp:

09/05/96 20:29:07 (27 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

7e230f10

Parents:

f254b93f

Message:

nanosleep: negative value for tv_sec is no longer an error. It now
is changed into being a 0 delay.

Files:

• c/src/exec/posix/src/time.c (modified) (2 diffs)
• cpukit/posix/src/time.c (modified) (2 diffs)

c/src/exec/posix/src/time.c

@@ -246 +246 @@
 )
 {
-  Watchdog_Interval ticks;
+  Watchdog_Interval  ticks;
+  struct timespec   *the_rqtp;
 
   if ( !rqtp )
     set_errno_and_return_minus_one( EINVAL );
+
+  the_rqtp = (struct timespec *)rqtp;
 
   /*
@@ -258 +261 @@
    */
 
-  if ( rqtp->tv_sec < 0 || rqtp->tv_nsec < 0 )
+  if ( the_rqtp->tv_sec < 0 )
+    the_rqtp->tv_sec = 0;
+
+  if ( /* the_rqtp->tv_sec < 0 || */ the_rqtp->tv_nsec < 0 )
     set_errno_and_return_minus_one( EAGAIN );
 
-  if ( rqtp->tv_nsec >= TOD_NANOSECONDS_PER_SECOND )
+  if ( the_rqtp->tv_nsec >= TOD_NANOSECONDS_PER_SECOND )
     set_errno_and_return_minus_one( EINVAL );
  
-  ticks = _POSIX_Timespec_to_interval( rqtp );
+  ticks = _POSIX_Timespec_to_interval( the_rqtp );
 
   /*

cpukit/posix/src/time.c

@@ -246 +246 @@
 )
 {
-  Watchdog_Interval ticks;
+  Watchdog_Interval  ticks;
+  struct timespec   *the_rqtp;
 
   if ( !rqtp )
     set_errno_and_return_minus_one( EINVAL );
+
+  the_rqtp = (struct timespec *)rqtp;
 
   /*
@@ -258 +261 @@
    */
 
-  if ( rqtp->tv_sec < 0 || rqtp->tv_nsec < 0 )
+  if ( the_rqtp->tv_sec < 0 )
+    the_rqtp->tv_sec = 0;
+
+  if ( /* the_rqtp->tv_sec < 0 || */ the_rqtp->tv_nsec < 0 )
     set_errno_and_return_minus_one( EAGAIN );
 
-  if ( rqtp->tv_nsec >= TOD_NANOSECONDS_PER_SECOND )
+  if ( the_rqtp->tv_nsec >= TOD_NANOSECONDS_PER_SECOND )
     set_errno_and_return_minus_one( EINVAL );
  
-  ticks = _POSIX_Timespec_to_interval( rqtp );
+  ticks = _POSIX_Timespec_to_interval( the_rqtp );
 
   /*