summaryrefslogtreecommitdiffstats
path: root/cpukit/score/src/objectsetname.c
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2011-02-16 00:24:49 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2011-02-16 00:24:49 +0000
commita0323a9f8f673f2b4d7a70e2019fa47d3df76d96 (patch)
tree86f72a2427700fa35af175738c9efb404fae2e96 /cpukit/score/src/objectsetname.c
parent2011-02-15 Jennifer Averett (diff)
downloadrtems-a0323a9f8f673f2b4d7a70e2019fa47d3df76d96.tar.bz2
2011-02-15 Joel Sherrill <joel.sherrilL@OARcorp.com>
* 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.
Diffstat (limited to 'cpukit/score/src/objectsetname.c')
-rw-r--r--cpukit/score/src/objectsetname.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/cpukit/score/src/objectsetname.c b/cpukit/score/src/objectsetname.c
index 3e81811a99..793e0914dd 100644
--- a/cpukit/score/src/objectsetname.c
+++ b/cpukit/score/src/objectsetname.c
@@ -47,10 +47,8 @@ bool _Objects_Set_name(
if ( !d )
return false;
- if ( the_object->name.name_p ) {
- _Workspace_Free( (void *)the_object->name.name_p );
- the_object->name.name_p = NULL;
- }
+ _Workspace_Free( (void *)the_object->name.name_p );
+ the_object->name.name_p = NULL;
strncpy( d, name, length );
d[length] = '\0';