Mirrors_Framework/rtems
1
0
Fork 0
mirror of https://gitlab.rtems.org/rtems/rtos/rtems.git synced 2026-09-24 05:26:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

2009-09-28 Joel Sherrill <joel.sherrill@OARcorp.com>

Browse Source 
* score/src/objectidtoname.c: Remove error which cannot be reached
	since API that calls this checks the error first.
	* score/src/objectsetname.c: Adjust handling of length.
This commit is contained in:
Joel Sherrill
2009-09-28 23:00:20 +00:00
parent af20cd903b
commit 6fd4d06f39
3 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cpukit/ChangeLog
+6
View File
@@ -1,3 +1,9 @@
2009-09-28 Joel Sherrill <joel.sherrill@OARcorp.com>
* score/src/objectidtoname.c: Remove error which cannot be reached
since API that calls this checks the error first.
* score/src/objectsetname.c: Adjust handling of length.
2009-09-28 Joel Sherrill <joel.sherrill@OARcorp.com>
* rtems/src/regiondelete.c, rtems/src/regiongetfreeinfo.c,
cpukit/score/src/objectidtoname.c
+4 -6
View File
@@ -20,8 +20,7 @@
#include <rtems/score/object.h>
#include <rtems/score/thread.h>
/*PAGE
*
/*
* _Objects_Id_to_name
*
* DESCRIPTION:
@@ -34,8 +33,6 @@
* name - pointer to location in which to store name
*
*/
Objects_Name_or_id_lookup_errors _Objects_Id_to_name (
Objects_Id id,
Objects_Name *name
@@ -48,8 +45,9 @@ Objects_Name_or_id_lookup_errors _Objects_Id_to_name (
Objects_Control *the_object = (Objects_Control *) 0;
Objects_Locations ignored_location;
if ( !name )
return OBJECTS_INVALID_NAME;
/*
* Caller is trusted for name != NULL.
*/
tmpId = (id == OBJECTS_ID_OF_SELF) ? _Thread_Executing->Object.id : id;
cpukit/score/src/objectsetname.c
+6 -6
View File
@@ -37,13 +37,13 @@ bool _Objects_Set_name(
const char *s;
s = name;
length = strnlen( name, information->name_length ) + 1;
length = strnlen( name, information->name_length );
#if defined(RTEMS_SCORE_OBJECT_ENABLE_STRING_NAMES)
if ( information->is_string ) {
char *d;
d = _Workspace_Allocate( length );
d = _Workspace_Allocate( length + 1 );
if ( !d )
return false;
@@ -58,10 +58,10 @@ bool _Objects_Set_name(
#endif
{
the_object->name.name_u32 = _Objects_Build_name(
((0<length) ? s[ 0 ] : ' '),
((1<length) ? s[ 1 ] : ' '),
((2<length) ? s[ 2 ] : ' '),
((3<length) ? s[ 3 ] : ' ')
((0 <= length) ? s[ 0 ] : ' '),
((1 < length) ? s[ 1 ] : ' '),
((2 < length) ? s[ 2 ] : ' '),
((3 < length) ? s[ 3 ] : ' ')
);
}