From a0323a9f8f673f2b4d7a70e2019fa47d3df76d96 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Wed, 16 Feb 2011 00:24:49 +0000 Subject: 2011-02-15 Joel Sherrill * libmisc/capture/capture.c, posix/src/keyfreememory.c, posix/src/pthread.c, score/include/rtems/score/wkspace.h, score/src/objectextendinformation.c, score/src/objectnamespaceremove.c, score/src/objectsetname.c, score/src/threadclose.c, score/src/threadinitialize.c, score/src/wkspace.c: Many places were checking for a NULL pointer before calling _Workspace_Free. By moving the check into _Workspace_Free, we eliminate a number of conditional paths and make it harder to return a NULL pointer. --- cpukit/posix/src/keyfreememory.c | 3 +-- cpukit/posix/src/pthread.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'cpukit/posix') diff --git a/cpukit/posix/src/keyfreememory.c b/cpukit/posix/src/keyfreememory.c index a103499b6a..b6449ffa21 100644 --- a/cpukit/posix/src/keyfreememory.c +++ b/cpukit/posix/src/keyfreememory.c @@ -25,6 +25,5 @@ void _POSIX_Keys_Free_memory( uint32_t the_api; for ( the_api = 1; the_api <= OBJECTS_APIS_LAST; the_api++ ) - if ( the_key->Values[ the_api ] ) - _Workspace_Free( the_key->Values[ the_api ] ); + _Workspace_Free( the_key->Values[ the_api ] ); } diff --git a/cpukit/posix/src/pthread.c b/cpukit/posix/src/pthread.c index 06ce1fe168..3890144aa5 100644 --- a/cpukit/posix/src/pthread.c +++ b/cpukit/posix/src/pthread.c @@ -270,7 +270,7 @@ void _POSIX_Threads_Delete_extension( deleted->API_Extensions[ THREAD_API_POSIX ] = NULL; - (void) _Workspace_Free( api ); + _Workspace_Free( api ); } /* -- cgit v1.2.3