2007-11-30 Joel Sherrill <joel.sherrill@OARcorp.com>

	* rtems/src/barrierdelete.c, rtems/src/barrierrelease.c,
	rtems/src/barriertranslatereturncode.c, rtems/src/barrierwait.c,
	rtems/src/clockget.c, rtems/src/dpmemdelete.c,
	rtems/src/dpmemexternal2internal.c,
	rtems/src/dpmeminternal2external.c, rtems/src/eventsend.c,
	rtems/src/eventtimeout.c, rtems/src/msgqbroadcast.c,
	rtems/src/msgqdelete.c, rtems/src/msgqflush.c,
	rtems/src/msgqgetnumberpending.c, rtems/src/msgqreceive.c,
	rtems/src/msgqsend.c, rtems/src/msgqurgent.c, rtems/src/partdelete.c,
	rtems/src/partgetbuffer.c, rtems/src/partreturnbuffer.c,
	rtems/src/ratemoncancel.c, rtems/src/ratemondelete.c,
	rtems/src/ratemongetstatistics.c, rtems/src/ratemongetstatus.c,
	rtems/src/ratemonperiod.c, rtems/src/ratemonresetstatistics.c,
	rtems/src/ratemontimeout.c, rtems/src/semdelete.c,
	rtems/src/semflush.c, rtems/src/semobtain.c, rtems/src/semrelease.c,
	rtems/src/semtranslatereturncode.c, rtems/src/signalsend.c,
	rtems/src/taskdelete.c, rtems/src/taskgetnote.c,
	rtems/src/taskissuspended.c, rtems/src/taskrestart.c,
	rtems/src/taskresume.c, rtems/src/tasksetnote.c,
	rtems/src/tasksetpriority.c, rtems/src/taskstart.c,
	rtems/src/tasksuspend.c, rtems/src/taskvariableadd.c,
	rtems/src/taskvariabledelete.c, rtems/src/taskvariableget.c,
	rtems/src/timercancel.c, rtems/src/timerdelete.c,
	rtems/src/timerfirewhen.c, rtems/src/timergetinfo.c,
	rtems/src/timerreset.c, rtems/src/timerserverfireafter.c,
	rtems/src/timerserverfirewhen.c: Restructured all code with
	the switch (location) pattern so that OBJECTS_LOCAL is first
	and we can fall into it and the OBJECTS_ERROR case breaks
	to a return RTEMS_INVALID_ID.  This eliminates the return
	RTEMS_INTERNAL_ERROR at the bottom of each of these files which
	was unreachable and untestable code.  This resulted in a code
	savings of approximately 20 bytes per file on the SPARC/ERC32.

1 files changed, 7 insertions, 8 deletions

diff --git a/cpukit/rtems/src/timercancel.c b/cpukit/rtems/src/timercancel.c
index fd8d1bee32..e369f0766d 100644
--- a/cpukit/rtems/src/timercancel.c
+++ b/cpukit/rtems/src/timercancel.c
@@ -48,20 +48,19 @@ rtems_status_code rtems_timer_cancel(
 
   the_timer = _Timer_Get( id, &location );
   switch ( location ) {
-#if defined(RTEMS_MULTIPROCESSING)
-    case OBJECTS_REMOTE:            /* should never return this */
-      return RTEMS_INTERNAL_ERROR;
-#endif
-
-    case OBJECTS_ERROR:
-      return RTEMS_INVALID_ID;
 
     case OBJECTS_LOCAL:
       if ( !_Timer_Is_dormant_class( the_timer->the_class ) )
         (void) _Watchdog_Remove( &the_timer->Ticker );
       _Thread_Enable_dispatch();
       return RTEMS_SUCCESSFUL;
+
+#if defined(RTEMS_MULTIPROCESSING)
+    case OBJECTS_REMOTE:            /* should never return this */
+#endif
+    case OBJECTS_ERROR:
+      break;
   }
 
-  return RTEMS_INTERNAL_ERROR;   /* unreached - only to remove warnings */
+  return RTEMS_INVALID_ID;
 }