From f768a430368b997a2ed32900157cce3f58a39fb3 Mon Sep 17 00:00:00 2001 From: Joseph Hickey Date: Thu, 28 May 2020 10:49:49 -0400 Subject: [PATCH] HOTFIX: Fix parameter name consistency Use "object_id" rather than "id" for consistency with other API calls. The difference was flagged as a warning by doxygen. --- src/os/inc/osapi-os-core.h | 2 +- src/os/shared/src/osapi-idmap.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/os/inc/osapi-os-core.h b/src/os/inc/osapi-os-core.h index 8afd6e923..580513ea5 100644 --- a/src/os/inc/osapi-os-core.h +++ b/src/os/inc/osapi-os-core.h @@ -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); /*-------------------------------------------------------------------------------------*/ /** diff --git a/src/os/shared/src/osapi-idmap.c b/src/os/shared/src/osapi-idmap.c index d23254c8a..e768eac4d 100644 --- a/src/os/shared/src/osapi-idmap.c +++ b/src/os/shared/src/osapi-idmap.c @@ -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; @@ -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)