From fa331d5b39de6465953a33d97390eb47b0276221 Mon Sep 17 00:00:00 2001
From: winckel <winckel@eurecom.fr>
Date: Mon, 9 Dec 2013 10:03:21 +0000
Subject: [PATCH] Renamed some defines to avoid conflict with openair2 log.
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@4643 818b1a75-f10b-46b9-bf7c-635c3b92a50f
---
openair-cn/NAS/EURECOM-NAS/src/util/nas_log.c | 14 ++++++-------
openair-cn/NAS/EURECOM-NAS/src/util/nas_log.h | 20 +++++++++----------
2 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/openair-cn/NAS/EURECOM-NAS/src/util/nas_log.c b/openair-cn/NAS/EURECOM-NAS/src/util/nas_log.c
index 18dd0ef1f7f..a2848c3ad11 100644
--- a/openair-cn/NAS/EURECOM-NAS/src/util/nas_log.c
+++ b/openair-cn/NAS/EURECOM-NAS/src/util/nas_log.c
@@ -78,12 +78,12 @@ static log_context_t _log_context = {
0x00, /* filter */
0, /* indent */
{
- { "DEBUG", LOG_DEBUG, LOG_GREEN }, /* DEBUG */
- { "INFO", LOG_INFO, LOG_AUTO }, /* INFO */
- { "WARNING", LOG_WARNING, LOG_BLUE }, /* WARNING */
- { "ERROR", LOG_ERROR, LOG_RED }, /* ERROR */
- { "", LOG_FUNC, LOG_AUTO }, /* FUNC_IN */
- { "", LOG_FUNC, LOG_AUTO }, /* FUNC_OUT */
+ { "DEBUG", NAS_LOG_DEBUG, LOG_GREEN }, /* DEBUG */
+ { "INFO", NAS_LOG_INFO, LOG_AUTO }, /* INFO */
+ { "WARNING", NAS_LOG_WARNING, LOG_BLUE }, /* WARNING */
+ { "ERROR", NAS_LOG_ERROR, LOG_RED }, /* ERROR */
+ { "", NAS_LOG_FUNC, LOG_AUTO }, /* FUNC_IN */
+ { "", NAS_LOG_FUNC, LOG_AUTO }, /* FUNC_OUT */
} /* level[] */
};
@@ -209,7 +209,7 @@ void log_dump(const char* data, int len)
{
int i;
/* Display only authorized logging traces */
- if ( (len > 0) && (LOG_HEX & _log_context.filter) )
+ if ( (len > 0) && (NAS_LOG_HEX & _log_context.filter) )
{
int bytes = 0;
diff --git a/openair-cn/NAS/EURECOM-NAS/src/util/nas_log.h b/openair-cn/NAS/EURECOM-NAS/src/util/nas_log.h
index fba5a8a38a4..65f3b6ed9e6 100644
--- a/openair-cn/NAS/EURECOM-NAS/src/util/nas_log.h
+++ b/openair-cn/NAS/EURECOM-NAS/src/util/nas_log.h
@@ -38,16 +38,16 @@ Description Usefull logging functions
* ON : Enables logging traces excepted FUNC.
* ALL : Turns on ALL logging traces.
*/
-#define LOG_OFF 0x00 /* No trace */
-#define LOG_DEBUG 0x01 /* Debug trace */
-#define LOG_INFO 0x02 /* Informational trace */
-#define LOG_WARNING 0x04 /* Warning trace */
-#define LOG_ERROR 0x08 /* Error trace */
-#define LOG_FUNC 0x10 /* Entering/Leaving function trace */
-#define LOG_HEX 0x20 /* Dump trace */
-
-#define LOG_ON 0x0F /* All traces excepted FUNC and HEX */
-#define LOG_ALL 0xFF /* All traces */
+#define NAS_LOG_OFF 0x00 /* No trace */
+#define NAS_LOG_DEBUG 0x01 /* Debug trace */
+#define NAS_LOG_INFO 0x02 /* Informational trace */
+#define NAS_LOG_WARNING 0x04 /* Warning trace */
+#define NAS_LOG_ERROR 0x08 /* Error trace */
+#define NAS_LOG_FUNC 0x10 /* Entering/Leaving function trace */
+#define NAS_LOG_HEX 0x20 /* Dump trace */
+
+#define NAS_LOG_ON 0x0F /* All traces excepted FUNC and HEX */
+#define NAS_LOG_ALL 0xFF /* All traces */
/* Logging severity type */
typedef enum
--
GitLab