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/score/src/threadinitialize.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) (limited to 'cpukit/score/src/threadinitialize.c') diff --git a/cpukit/score/src/threadinitialize.c b/cpukit/score/src/threadinitialize.c index e7aede1cfe..df20017af4 100644 --- a/cpukit/score/src/threadinitialize.c +++ b/cpukit/score/src/threadinitialize.c @@ -225,26 +225,19 @@ bool _Thread_Initialize( return true; failed: - if ( the_thread->libc_reent ) - _Workspace_Free( the_thread->libc_reent ); + _Workspace_Free( the_thread->libc_reent ); for ( i=0 ; i <= THREAD_API_LAST ; i++ ) - if ( the_thread->API_Extensions[i] ) - _Workspace_Free( the_thread->API_Extensions[i] ); + _Workspace_Free( the_thread->API_Extensions[i] ); - if ( extensions_area ) - (void) _Workspace_Free( extensions_area ); + _Workspace_Free( extensions_area ); #if ( CPU_HARDWARE_FP == TRUE ) || ( CPU_SOFTWARE_FP == TRUE ) - if ( fp_area ) - (void) _Workspace_Free( fp_area ); + _Workspace_Free( fp_area ); #endif - if ( sched ) - (void) _Workspace_Free( sched ); + _Workspace_Free( sched ); _Thread_Stack_Free( the_thread ); return false; - - } -- cgit v1.2.3