summaryrefslogtreecommitdiffstats
path: root/cpukit/rtems/src/regiongetsegment.c
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2009-10-10 15:15:12 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2009-10-10 15:15:12 +0000
commit58a8a4717dfe766ab92237cfe9c5e1dc9352bba8 (patch)
tree9a847df2987cce4bf8a64aaeee0eea7fc63583cb /cpukit/rtems/src/regiongetsegment.c
parent2009-10-10 Joel Sherrill <joel.sherrill@oarcorp.com> (diff)
downloadrtems-58a8a4717dfe766ab92237cfe9c5e1dc9352bba8.tar.bz2
2009-10-10 Joel Sherrill <joel.sherrill@oarcorp.com>
* rtems/src/regiondelete.c, rtems/src/regionextend.c, rtems/src/regiongetfreeinfo.c, rtems/src/regiongetinfo.c, rtems/src/regiongetsegment.c, rtems/src/regionresizesegment.c, rtems/src/regionreturnsegment.c: Avoid initializing status code. This generates dead code on some targets. Add default case to eliminate unitialized variable warning.
Diffstat (limited to 'cpukit/rtems/src/regiongetsegment.c')
-rw-r--r--cpukit/rtems/src/regiongetsegment.c20
1 files changed, 9 insertions, 11 deletions
diff --git a/cpukit/rtems/src/regiongetsegment.c b/cpukit/rtems/src/regiongetsegment.c
index 680ced6369..0e46b07e71 100644
--- a/cpukit/rtems/src/regiongetsegment.c
+++ b/cpukit/rtems/src/regiongetsegment.c
@@ -53,11 +53,11 @@ rtems_status_code rtems_region_get_segment(
void **segment
)
{
- Thread_Control *executing;
- Objects_Locations location;
- rtems_status_code return_status = RTEMS_SUCCESSFUL;
- register Region_Control *the_region;
- void *the_segment;
+ Thread_Control *executing;
+ Objects_Locations location;
+ rtems_status_code return_status;
+ Region_Control *the_region;
+ void *the_segment;
if ( !segment )
return RTEMS_INVALID_ADDRESS;
@@ -87,13 +87,10 @@ rtems_status_code rtems_region_get_segment(
if ( the_segment ) {
the_region->number_of_used_blocks += 1;
*segment = the_segment;
- }
-
- else if ( _Options_Is_no_wait( option_set ) ) {
+ return_status = RTEMS_SUCCESSFUL;
+ } else if ( _Options_Is_no_wait( option_set ) ) {
return_status = RTEMS_UNSATISFIED;
- }
-
- else {
+ } else {
/*
* Switch from using the memory allocation mutex to using a
* dispatching disabled critical section. We have to do this
@@ -124,6 +121,7 @@ rtems_status_code rtems_region_get_segment(
#endif
case OBJECTS_ERROR:
+ default:
return_status = RTEMS_INVALID_ID;
break;
}