Skip to content

Commit

Permalink
HOTFIX: Fix parameter name consistency
Browse files Browse the repository at this point in the history
Use "object_id" rather than "id" for consistency with other API calls.
The difference was flagged as a warning by doxygen.
  • Loading branch information
jphickey committed May 28, 2020
1 parent 5c8a01c commit f768a43
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/os/inc/osapi-os-core.h
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ void OS_ApplicationExit(int32 Status);
* #OS_INVALID_POINTER if the passed-in buffer is invalid
* #OS_ERR_NAME_TOO_LONG if the name will not fit in the buffer provided
*/
int32 OS_GetResourceName(uint32 id, char *buffer, uint32 buffer_size);
int32 OS_GetResourceName(uint32 object_id, char *buffer, uint32 buffer_size);

/*-------------------------------------------------------------------------------------*/
/**
Expand Down
6 changes: 3 additions & 3 deletions src/os/shared/src/osapi-idmap.c
Original file line number Diff line number Diff line change
Expand Up @@ -1172,7 +1172,7 @@ uint32 OS_IdentifyObject (uint32 object_id)
* See description in API and header file for detail
*
*-----------------------------------------------------------------*/
int32 OS_GetResourceName(uint32 id, char *buffer, uint32 buffer_size)
int32 OS_GetResourceName(uint32 object_id, char *buffer, uint32 buffer_size)
{
uint32 idtype;
OS_common_record_t *record;
Expand All @@ -1193,8 +1193,8 @@ int32 OS_GetResourceName(uint32 id, char *buffer, uint32 buffer_size)
*/
buffer[0] = 0;

idtype = OS_ObjectIdToType_Impl(id);
return_code = OS_ObjectIdGetById(OS_LOCK_MODE_GLOBAL, idtype, id, &local_id, &record);
idtype = OS_ObjectIdToType_Impl(object_id);
return_code = OS_ObjectIdGetById(OS_LOCK_MODE_GLOBAL, idtype, object_id, &local_id, &record);
if (return_code == OS_SUCCESS)
{
if (record->name_entry != NULL)
Expand Down

0 comments on commit f768a43

Please sign in to comment.