From 8f6b7b5122519871f9287bc50a014704f5c2b220 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Sun, 11 Oct 2009 22:37:38 +0000 Subject: 2009-10-11 Joel Sherrill * posix/src/alarm.c: If 0 seconds do not insert timer. * rtems/src/regionextend.c: Eliminate warning. Use default else. --- cpukit/ChangeLog | 5 +++++ cpukit/posix/src/alarm.c | 3 ++- cpukit/rtems/src/regionextend.c | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) (limited to 'cpukit') diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index 3d7d207a57..3c1e1e350d 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,3 +1,8 @@ +2009-10-11 Joel Sherrill + + * posix/src/alarm.c: If 0 seconds do not insert timer. + * rtems/src/regionextend.c: Eliminate warning. Use default else. + 2009-10-11 Joel Sherrill * score/inline/rtems/score/thread.inl, score/src/threaddispatch.c: diff --git a/cpukit/posix/src/alarm.c b/cpukit/posix/src/alarm.c index 266df94283..eb15b98e80 100644 --- a/cpukit/posix/src/alarm.c +++ b/cpukit/posix/src/alarm.c @@ -71,7 +71,8 @@ unsigned int alarm( } } - _Watchdog_Insert_seconds( the_timer, seconds ); + if ( seconds ) + _Watchdog_Insert_seconds( the_timer, seconds ); return remaining; } diff --git a/cpukit/rtems/src/regionextend.c b/cpukit/rtems/src/regionextend.c index 15134237ac..6d181a09dc 100644 --- a/cpukit/rtems/src/regionextend.c +++ b/cpukit/rtems/src/regionextend.c @@ -77,7 +77,7 @@ rtems_status_code rtems_region_extend( return_status = RTEMS_SUCCESSFUL; } else if ( heap_status == HEAP_EXTEND_ERROR ) { return_status = RTEMS_INVALID_ADDRESS; - } else if ( heap_status == HEAP_EXTEND_NOT_IMPLEMENTED ) { + } else /* if ( heap_status == HEAP_EXTEND_NOT_IMPLEMENTED ) */ { return_status = RTEMS_NOT_IMPLEMENTED; } break; -- cgit v1.2.3