summaryrefslogtreecommitdiff
path: root/packages/ixp4xx/ixp-osal-2.1/assert.patch
blob: a03113dcc2e496658260ebf2b8b9694ab68cd4cd (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
# Unnecessary patch - reduces the code size slightly, gives clearer
# messages if IX_OSAL_ENSURE_ON is set
# include/IxOsalAssert.h                 |    4 ++--
# os/linux/include/core/IxOsalOsAssert.h |    9 ++++++++-
# 2 files changed, 10 insertions(+), 3 deletions(-)
#
--- ixp_osal/include/IxOsalAssert.h	1970-01-01 00:00:00.000000000 +0000
+++ ixp_osal/include/IxOsalAssert.h	1970-01-01 00:00:00.000000000 +0000
@@ -72,8 +72,8 @@
  */
 #ifdef IX_OSAL_ENSURE_ON
 #define IX_OSAL_ENSURE(c, str) do { \
-if (!(c)) ixOsalLog (IX_OSAL_LOG_LVL_MESSAGE, IX_OSAL_LOG_DEV_STDOUT, str, \
-0, 0, 0, 0, 0, 0); } while (0)
+if (!(c)) ixOsalLog (IX_OSAL_LOG_LVL_MESSAGE, IX_OSAL_LOG_DEV_STDOUT, __FILE__ ": line %d: " str, \
+__LINE__, 0, 0, 0, 0, 0); } while (0)
 
 #else
 #define IX_OSAL_ENSURE(c, str)
--- ixp_osal/os/linux/include/core/IxOsalOsAssert.h	1970-01-01 00:00:00.000000000 +0000
+++ ixp_osal/os/linux/include/core/IxOsalOsAssert.h	1970-01-01 00:00:00.000000000 +0000
@@ -47,11 +47,18 @@
 
 #ifndef IxOsalOsAssert_H
 #define IxOsalOsAssert_H
+#ifdef IX_OSAL_ENSURE_ON
 #define IX_OSAL_OS_ASSERT(c)    if(!(c)) \
                                 { \
-                                    ixOsalLog (IX_OSAL_LOG_LVL_ERROR, IX_OSAL_LOG_DEV_STDOUT, "Assertion failure \n", 0, 0, 0, 0, 0, 0);\
+                                    ixOsalLog (IX_OSAL_LOG_LVL_ERROR, IX_OSAL_LOG_DEV_STDOUT, "%s line %d: Assertion failure: %s\n", (int)__FILE__, __LINE__, (int)#c, 0, 0, 0);\
                                     BUG(); \
                                 }
+#else
+#define IX_OSAL_OS_ASSERT(c)    if(!(c)) \
+                                { \
+                                    BUG(); \
+                                }
+#endif
 
 /* 
  * Place holder.