From 02fe6aba3922caf0b9d2e6a3a82a81e5b2ace43c Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Tue, 15 Aug 2000 13:23:13 +0000 Subject: 2000-08-15 Joel Sherrill * src/ptimer1.c: Minor formatting fixes. --- c/src/exec/posix/ChangeLog | 4 ++++ c/src/exec/posix/src/ptimer1.c | 13 +------------ cpukit/posix/ChangeLog | 4 ++++ cpukit/posix/src/ptimer1.c | 13 +------------ 4 files changed, 10 insertions(+), 24 deletions(-) diff --git a/c/src/exec/posix/ChangeLog b/c/src/exec/posix/ChangeLog index e4e262c0e1..89d247b8f0 100644 --- a/c/src/exec/posix/ChangeLog +++ b/c/src/exec/posix/ChangeLog @@ -1,3 +1,7 @@ +2000-08-15 Joel Sherrill + + * src/ptimer1.c: Minor formatting fixes. + 2000-08-15 Joel Sherrill * src/ptimer1.c: Removed unused routine PRINT_ERRNO_S. diff --git a/c/src/exec/posix/src/ptimer1.c b/c/src/exec/posix/src/ptimer1.c index 397c899c14..13eaa2b213 100644 --- a/c/src/exec/posix/src/ptimer1.c +++ b/c/src/exec/posix/src/ptimer1.c @@ -341,18 +341,13 @@ int timer_create( /* NEW VERSION*/ timer_struct[timer_pos].thread_id = pthread_self (); - if ( evp != NULL ) { - timer_struct[timer_pos].inf.sigev_notify = evp->sigev_notify; timer_struct[timer_pos].inf.sigev_signo = evp->sigev_signo; timer_struct[timer_pos].inf.sigev_value = evp->sigev_value; - } - timer_struct[timer_pos].timer_id = timer_id; - timer_struct[timer_pos].overrun = 0; timer_struct[timer_pos].timer_data.it_value.tv_sec = 0; @@ -361,20 +356,16 @@ int timer_create( timer_struct[timer_pos].timer_data.it_interval.tv_nsec = 0; return 0; - case RTEMS_INVALID_NAME : /* The assigned name is not valid */ PRINT_MSG_S ("ERROR: rtems create timer RTEMS_INVALID_NAME"); - set_errno_and_return_minus_one( EINVAL ); case RTEMS_TOO_MANY : - PRINT_MSG_S ("ERROR: rtems create timer RTEMS_TOO_MANY "); - /* There has been created too much timers for the same process */ - + PRINT_MSG_S ("ERROR: rtems create timer RTEMS_TOO_MANY "); set_errno_and_return_minus_one( EAGAIN ); default : @@ -386,7 +377,6 @@ int timer_create( */ set_errno_and_return_minus_one( EINVAL ); - } /* @@ -394,7 +384,6 @@ int timer_create( */ set_errno_and_return_minus_one( EINVAL ); - } /* diff --git a/cpukit/posix/ChangeLog b/cpukit/posix/ChangeLog index e4e262c0e1..89d247b8f0 100644 --- a/cpukit/posix/ChangeLog +++ b/cpukit/posix/ChangeLog @@ -1,3 +1,7 @@ +2000-08-15 Joel Sherrill + + * src/ptimer1.c: Minor formatting fixes. + 2000-08-15 Joel Sherrill * src/ptimer1.c: Removed unused routine PRINT_ERRNO_S. diff --git a/cpukit/posix/src/ptimer1.c b/cpukit/posix/src/ptimer1.c index 397c899c14..13eaa2b213 100644 --- a/cpukit/posix/src/ptimer1.c +++ b/cpukit/posix/src/ptimer1.c @@ -341,18 +341,13 @@ int timer_create( /* NEW VERSION*/ timer_struct[timer_pos].thread_id = pthread_self (); - if ( evp != NULL ) { - timer_struct[timer_pos].inf.sigev_notify = evp->sigev_notify; timer_struct[timer_pos].inf.sigev_signo = evp->sigev_signo; timer_struct[timer_pos].inf.sigev_value = evp->sigev_value; - } - timer_struct[timer_pos].timer_id = timer_id; - timer_struct[timer_pos].overrun = 0; timer_struct[timer_pos].timer_data.it_value.tv_sec = 0; @@ -361,20 +356,16 @@ int timer_create( timer_struct[timer_pos].timer_data.it_interval.tv_nsec = 0; return 0; - case RTEMS_INVALID_NAME : /* The assigned name is not valid */ PRINT_MSG_S ("ERROR: rtems create timer RTEMS_INVALID_NAME"); - set_errno_and_return_minus_one( EINVAL ); case RTEMS_TOO_MANY : - PRINT_MSG_S ("ERROR: rtems create timer RTEMS_TOO_MANY "); - /* There has been created too much timers for the same process */ - + PRINT_MSG_S ("ERROR: rtems create timer RTEMS_TOO_MANY "); set_errno_and_return_minus_one( EAGAIN ); default : @@ -386,7 +377,6 @@ int timer_create( */ set_errno_and_return_minus_one( EINVAL ); - } /* @@ -394,7 +384,6 @@ int timer_create( */ set_errno_and_return_minus_one( EINVAL ); - } /* -- cgit v1.2.3