From f6c2677a76b346259e4fc06eee9db06197fa1c7f Mon Sep 17 00:00:00 2001
From: winckel <winckel@eurecom.fr>
Date: Mon, 18 Nov 2013 08:25:11 +0000
Subject: [PATCH] Renamed ERROR and WARNING message to avoid conflicts with
enum value in openair-cn.
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@4425 818b1a75-f10b-46b9-bf7c-635c3b92a50f
---
common/utils/itti/intertask_messages_def.h | 4 ++--
openair2/UTIL/LOG/log.c | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/common/utils/itti/intertask_messages_def.h b/common/utils/itti/intertask_messages_def.h
index 7171764934..e2de4293ae 100644
--- a/common/utils/itti/intertask_messages_def.h
+++ b/common/utils/itti/intertask_messages_def.h
@@ -5,9 +5,9 @@ MESSAGE_DEF(TERMINATE_MESSAGE, MESSAGE_PRIORITY_MAX, struct {}, terminate_messa
MESSAGE_DEF(MESSAGE_TEST, MESSAGE_PRIORITY_MED, struct {}, message_test)
/* Error message */
-MESSAGE_DEF(ERROR, MESSAGE_PRIORITY_MAX, struct {}, error)
+MESSAGE_DEF(ERROR_LOG, MESSAGE_PRIORITY_MAX, struct {}, error_log)
/* Warning message */
-MESSAGE_DEF(WARNING, MESSAGE_PRIORITY_MAX, struct {}, warning)
+MESSAGE_DEF(WARNING_LOG, MESSAGE_PRIORITY_MAX, struct {}, warning_log)
/* Generic log message for text */
MESSAGE_DEF(GENERIC_LOG, MESSAGE_PRIORITY_MED, struct {}, generic_log)
diff --git a/openair2/UTIL/LOG/log.c b/openair2/UTIL/LOG/log.c
index 64d2c95f47..08ffd77435 100755
--- a/openair2/UTIL/LOG/log.c
+++ b/openair2/UTIL/LOG/log.c
@@ -656,20 +656,20 @@ void logRecord_mt(const char *file, const char *func, int line, int comp,
if (level <= LOG_ERR)
{
- messages_id = ERROR;
+ messages_id = ERROR_LOG;
}
else
{
- messages_id = WARNING;
+ messages_id = WARNING_LOG;
}
message_p = itti_alloc_new_message_sized(TASK_UNKNOWN, messages_id, message_string_size);
if (level <= LOG_ERR)
{
- message_msg_p = (char *) &message_p->msg.error;
+ message_msg_p = (char *) &message_p->msg.error_log;
}
else
{
- message_msg_p = (char *) &message_p->msg.warning;
+ message_msg_p = (char *) &message_p->msg.warning_log;
}
memcpy(message_msg_p, log_start, message_string_size);
--
GitLab