maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Renamed ERROR and WARNING message to avoid conflicts with enum value in openair-cn.

Browse Source 
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@4425 818b1a75-f10b-46b9-bf7c-635c3b92a50f
This commit is contained in:
winckel
2013-11-18 08:25:11 +00:00
parent 9a077d29a7
commit f6c2677a76
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/utils/itti/intertask_messages_def.h
+2 -2
View File
@@ -5,9 +5,9 @@ MESSAGE_DEF(TERMINATE_MESSAGE, MESSAGE_PRIORITY_MAX, struct {}, terminate_messa
MESSAGE_DEF(MESSAGE_TEST, MESSAGE_PRIORITY_MED, struct {}, message_test) MESSAGE_DEF(MESSAGE_TEST, MESSAGE_PRIORITY_MED, struct {}, message_test)
/* Error message */ /* Error message */
MESSAGE_DEF(ERROR, MESSAGE_PRIORITY_MAX, struct {}, error) MESSAGE_DEF(ERROR_LOG, MESSAGE_PRIORITY_MAX, struct {}, error_log)
/* Warning message */ /* 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 */ /* Generic log message for text */
MESSAGE_DEF(GENERIC_LOG, MESSAGE_PRIORITY_MED, struct {}, generic_log) MESSAGE_DEF(GENERIC_LOG, MESSAGE_PRIORITY_MED, struct {}, generic_log)
openair2/UTIL/LOG/log.c
+4 -4
View File
@@ -656,20 +656,20 @@ void logRecord_mt(const char *file, const char *func, int line, int comp,
if (level <= LOG_ERR) if (level <= LOG_ERR)
{ {
messages_id = ERROR; messages_id = ERROR_LOG;
} }
else else
{ {
messages_id = WARNING; messages_id = WARNING_LOG;
} }
message_p = itti_alloc_new_message_sized(TASK_UNKNOWN, messages_id, message_string_size); message_p = itti_alloc_new_message_sized(TASK_UNKNOWN, messages_id, message_string_size);
if (level <= LOG_ERR) if (level <= LOG_ERR)
{ {
message_msg_p = (char *) &message_p->msg.error; message_msg_p = (char *) &message_p->msg.error_log;
} }
else 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); memcpy(message_msg_p, log_start, message_string_size);