diff --git a/modules/es/fsw/src/cfe_es_cds.c b/modules/es/fsw/src/cfe_es_cds.c index 9e6d58603..957a57bb5 100644 --- a/modules/es/fsw/src/cfe_es_cds.c +++ b/modules/es/fsw/src/cfe_es_cds.c @@ -922,7 +922,7 @@ int32 CFE_ES_DeleteCDS(const char *CDSName, bool CalledByTblServices) /* Output the message to syslog once the CDS registry resource is unlocked */ if (LogMessage[0] != 0) { - CFE_ES_SYSLOG_APPEND(LogMessage); + CFE_ES_WriteToSysLog("%s", LogMessage); } return Status; diff --git a/modules/es/fsw/src/cfe_es_cds_mempool.c b/modules/es/fsw/src/cfe_es_cds_mempool.c index 4f02386fc..589dcac48 100644 --- a/modules/es/fsw/src/cfe_es_cds_mempool.c +++ b/modules/es/fsw/src/cfe_es_cds_mempool.c @@ -255,7 +255,7 @@ int32 CFE_ES_CDSBlockWrite(CFE_ES_CDSHandle_t Handle, const void *DataToWrite) /* Do the actual syslog if something went wrong */ if (LogMessage[0] != 0) { - CFE_ES_SYSLOG_APPEND(LogMessage); + CFE_ES_WriteToSysLog("%s", LogMessage); } return Status; @@ -348,7 +348,7 @@ int32 CFE_ES_CDSBlockRead(void *DataRead, CFE_ES_CDSHandle_t Handle) /* Do the actual syslog if something went wrong */ if (LogMessage[0] != 0) { - CFE_ES_SYSLOG_APPEND(LogMessage); + CFE_ES_WriteToSysLog("%s", LogMessage); } return Status; diff --git a/modules/es/fsw/src/cfe_es_log.h b/modules/es/fsw/src/cfe_es_log.h index cac9267c7..6dfb7c55b 100644 --- a/modules/es/fsw/src/cfe_es_log.h +++ b/modules/es/fsw/src/cfe_es_log.h @@ -85,26 +85,6 @@ */ #define CFE_ES_SYSLOG_READ_BUFFER_SIZE (3 * CFE_ES_MAX_SYSLOG_MSG_SIZE) -/** - * \brief Self-synchronized macro to call CFE_ES_SysLogAppend_Unsync - * - * Calls CFE_ES_SysLogAppend_Unsync() with appropriate synchronization. - * It will acquire the shared data lock and release it after appending the log. - * - * This is implemented as a macro such that the "__func__" and "__LINE__" directives - * will reflect the actual place that the append was done, rather than where this - * wrapper was defined. - * - * \sa CFE_ES_SysLogAppend_Unsync() - */ -#define CFE_ES_SYSLOG_APPEND(LogString) \ - { \ - CFE_ES_LockSharedData(__func__, __LINE__); \ - CFE_ES_SysLogAppend_Unsync(LogString); \ - CFE_ES_UnlockSharedData(__func__, __LINE__); \ - OS_printf("%s", LogString); \ - } - /** * \brief Indicates no context information Error Logs *