diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-01-31 14:14:27 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-01-31 14:14:27 +0000 |
commit | 91b8fb9e9aae067834e702370b311c69a05e1df9 (patch) | |
tree | 09388c57f8f0e6020c97782a9be7078e7fc6869a /cpukit/rtems | |
parent | 2008-01-30 Joel Sherrill <joel.sherrill@OARcorp.com> (diff) | |
download | rtems-91b8fb9e9aae067834e702370b311c69a05e1df9.tar.bz2 |
2008-01-31 Joel Sherrill <joel.sherrill@OARcorp.com>
* score/include/rtems/score/object.h, score/src/objectgetinfo.c,
rtems/include/rtems/rtems/object.h,
rtems/src/rtemsobjectgetapiclassname.c,
rtems/src/rtemsobjectgetclassinfo.c: class is a C++ keyword and
cannot be used as a parameter.
Diffstat (limited to 'cpukit/rtems')
-rw-r--r-- | cpukit/rtems/include/rtems/rtems/object.h | 19 | ||||
-rw-r--r-- | cpukit/rtems/src/rtemsobjectgetapiclassname.c | 8 | ||||
-rw-r--r-- | cpukit/rtems/src/rtemsobjectgetclassinfo.c | 6 |
3 files changed, 17 insertions, 16 deletions
diff --git a/cpukit/rtems/include/rtems/rtems/object.h b/cpukit/rtems/include/rtems/rtems/object.h index 6bcab81e8c..bb989df22c 100644 --- a/cpukit/rtems/include/rtems/rtems/object.h +++ b/cpukit/rtems/include/rtems/rtems/object.h @@ -20,6 +20,7 @@ extern "C" { #endif +#include <stdint.h> #include <rtems/score/object.h> #include <rtems/rtems/status.h> #include <rtems/rtems/types.h> @@ -287,26 +288,26 @@ const char *rtems_object_get_api_name( * This method returns a string containing the name of the * @a class from the specified @a api. * - * @param[in] api is the API for the class - * @param[in] class is the class to obtain the name of + * @param[in] the_api is the API for the class + * @param[in] the_class is the class to obtain the name of * * @return If successful, this method returns the name of * the specified @a class. Otherwise, it returns * the string "BAD CLASS" */ const char *rtems_object_get_api_class_name( - uint32_t api, - uint32_t class + uint32_t the_api, + uint32_t the_class ); /** * @brief Get Class Name * * This method returns a string containing the name of the - * @a class from the specified @a api. + * @a the_class from the specified @a api. * - * @param[in] api is the API for the class - * @param[in] class is the class to obtain information about + * @param[in] the_api is the API for the class + * @param[in] the_class is the class to obtain information about * @param[in] info points to the information structure to fill in * * @return If successful, this method returns the name of @@ -315,8 +316,8 @@ const char *rtems_object_get_api_class_name( * */ rtems_status_code rtems_object_get_class_information( - uint32_t api, - uint32_t class, + uint32_t the_api, + uint32_t the_class, rtems_object_api_class_information *info ); diff --git a/cpukit/rtems/src/rtemsobjectgetapiclassname.c b/cpukit/rtems/src/rtemsobjectgetapiclassname.c index 9455a9aece..ebf36339d7 100644 --- a/cpukit/rtems/src/rtemsobjectgetapiclassname.c +++ b/cpukit/rtems/src/rtemsobjectgetapiclassname.c @@ -70,14 +70,14 @@ rtems_assoc_t rtems_object_api_itron_assoc[] = { #endif const char *rtems_object_get_api_class_name( - uint32_t api, - uint32_t class + uint32_t the_api, + uint32_t the_class ) { const rtems_assoc_t *api_assoc; const rtems_assoc_t *class_assoc; - switch (api) { + switch (the_api) { case OBJECTS_INTERNAL_API: api_assoc = rtems_object_api_internal_assoc; break; @@ -97,7 +97,7 @@ const char *rtems_object_get_api_class_name( default: return "BAD API"; } - class_assoc = rtems_assoc_ptr_by_local( api_assoc, class ); + class_assoc = rtems_assoc_ptr_by_local( api_assoc, the_class ); if ( class_assoc ) return class_assoc->name; return "BAD CLASS"; diff --git a/cpukit/rtems/src/rtemsobjectgetclassinfo.c b/cpukit/rtems/src/rtemsobjectgetclassinfo.c index ec111c0181..f47846506f 100644 --- a/cpukit/rtems/src/rtemsobjectgetclassinfo.c +++ b/cpukit/rtems/src/rtemsobjectgetclassinfo.c @@ -24,8 +24,8 @@ #include <rtems/rtems/object.h> rtems_status_code rtems_object_get_class_information( - uint32_t api, - uint32_t class, + uint32_t the_api, + uint32_t the_class, rtems_object_api_class_information *info ) { @@ -39,7 +39,7 @@ rtems_status_code rtems_object_get_class_information( if ( !info ) return RTEMS_INVALID_ADDRESS; - obj_info = _Objects_Get_information( api, class ); + obj_info = _Objects_Get_information( the_api, the_class ); if ( !obj_info ) return RTEMS_INVALID_NUMBER; |