2010-07-26 Joel Sherrill <joel.sherrill@oarcorp.com>

	* libcsupport/src/privateenv.c, libmisc/cpuuse/cpuusagereport.c,
	posix/Makefile.am, posix/include/rtems/posix/key.h,
	posix/src/keycreate.c, posix/src/keydelete.c,
	score/src/iterateoverthreads.c: Since removing ITRON, the loop over
	all APIs for tasks has a path that cannot be reached. Either modify
	the code or mark tests for NULL as RTEMS_DEBUG.
	* posix/src/keyfreememory.c: New file.

1 files changed, 35 insertions, 43 deletions

diff --git a/cpukit/posix/src/keycreate.c b/cpukit/posix/src/keycreate.c
index 1da82a3c34..15382bbe4a 100644
--- a/cpukit/posix/src/keycreate.c
+++ b/cpukit/posix/src/keycreate.c
@@ -1,5 +1,5 @@
 /*
- *  COPYRIGHT (c) 1989-2007.
+ *  COPYRIGHT (c) 1989-2010.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -23,8 +23,7 @@
 #include <rtems/score/wkspace.h>
 #include <rtems/posix/key.h>
 
-/*PAGE
- *
+/*
  *  17.1.1 Thread-Specific Data Key Create, P1003.1c/Draft 10, p. 163
  */
 
@@ -56,52 +55,45 @@ int pthread_key_create(
    *
    *  NOTE: Currently RTEMS Classic API tasks are always enabled.
    */
-
-  for ( the_api = 1;
-        the_api <= OBJECTS_APIS_LAST;
-        the_api++ ) {
-
-    if ( _Objects_Information_table[ the_api ] ) {
-      #if defined(RTEMS_DEBUG)
-        /*
-         * Currently all managers are installed if the API is installed.
-         * This would be a horrible implementation error.
-         */
-        if (_Objects_Information_table[ the_api ][ 1 ] == NULL )
-          _Internal_error_Occurred(
-            INTERNAL_ERROR_CORE,
-            true,
-            INTERNAL_ERROR_IMPLEMENTATION_KEY_CREATE_INCONSISTENCY
-          );
-      #endif
-      bytes_to_allocate = sizeof( void * ) *
-        (_Objects_Information_table[ the_api ][ 1 ]->maximum + 1);
-      table = _Workspace_Allocate( bytes_to_allocate );
-      if ( !table ) {
-        for ( --the_api;
-              the_api >= 1;
-              the_api-- )
-          _Workspace_Free( the_key->Values[ the_api ] );
-
-        _POSIX_Keys_Free( the_key );
-        _Thread_Enable_dispatch();
-        return ENOMEM;
-      }
-
-      the_key->Values[ the_api ] = table;
-      memset( table, '\0', bytes_to_allocate );
-    } else {
-      the_key->Values[ the_api ] = NULL;
+  for ( the_api = 1; the_api <= OBJECTS_APIS_LAST; the_api++ ) {
+    the_key->Values[ the_api ] = NULL;
+
+    #if defined(RTEMS_DEBUG)
+      /*
+       *  Since the removal of ITRON, this cannot occur.
+       */
+      if ( !_Objects_Information_table[ api_index ] )
+	continue;
+
+      /*
+       * Currently all managers are installed if the API is installed.
+       * This would be a horrible implementation error.
+       */
+      if (_Objects_Information_table[ the_api ][ 1 ] == NULL )
+	_Internal_error_Occurred(
+	  INTERNAL_ERROR_CORE,
+	  true,
+	  INTERNAL_ERROR_IMPLEMENTATION_KEY_CREATE_INCONSISTENCY
+	);
+    #endif
+
+    bytes_to_allocate = sizeof( void * ) *
+      (_Objects_Information_table[ the_api ][ 1 ]->maximum + 1);
+    table = _Workspace_Allocate( bytes_to_allocate );
+    if ( !table ) {
+      _POSIX_Keys_Free_memory( the_key );
+
+      _POSIX_Keys_Free( the_key );
+      _Thread_Enable_dispatch();
+      return ENOMEM;
     }
 
-
+    the_key->Values[ the_api ] = table;
+    memset( table, '\0', bytes_to_allocate );
   }
 
   _Objects_Open_u32( &_POSIX_Keys_Information, &the_key->Object, 0 );
-
   *key = the_key->Object.id;
-
   _Thread_Enable_dispatch();
-
   return 0;
 }