osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

dfilter: Fix ws_assert_magic() macro 

We need to use WS_DISABLE_DEBUG, not WS_DEBUG.

Fixes 0e50979b3f.

Rename some lingering assert_magic() references.
This commit is contained in:
João Valverde 2021-10-06 12:21:59 +01:00 committed by Wireshark GitLab Utility
parent 5f8ab69cb5
commit a7242733a4
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
epan/dfilter/sttype-test.c
View File

@ -54,7 +54,7 @@ static void
test_free(gpointer value)
{
test_t *test = (test_t *)value;
assert_magic(test, TEST_MAGIC);
ws_assert_magic(test, TEST_MAGIC);
if (test->val1)
stnode_free(test->val1);
@ -68,7 +68,7 @@ static char *
test_tostr(const void *value)
{
const test_t *test = (const test_t *)value;
assert_magic(test, TEST_MAGIC);
ws_assert_magic(test, TEST_MAGIC);
const char *s = "<null>";
@ -158,7 +158,7 @@ sttype_test_set1(stnode_t *node, test_op_t op, stnode_t *val1)
test_t *test;
test = (test_t*)stnode_data(node);
assert_magic(test, TEST_MAGIC);
ws_assert_magic(test, TEST_MAGIC);
g_assert_true(num_operands(op) == 1);
test->op = op;
@ -171,7 +171,7 @@ sttype_test_set2(stnode_t *node, test_op_t op, stnode_t *val1, stnode_t *val2)
test_t *test;
test = (test_t*)stnode_data(node);
assert_magic(test, TEST_MAGIC);
ws_assert_magic(test, TEST_MAGIC);
g_assert_true(num_operands(op) == 2);
test->op = op;
@ -185,7 +185,7 @@ sttype_test_set2_args(stnode_t *node, stnode_t *val1, stnode_t *val2)
test_t *test;
test = (test_t*)stnode_data(node);
assert_magic(test, TEST_MAGIC);
ws_assert_magic(test, TEST_MAGIC);
if (num_operands(test->op) == 1) {
g_assert_true(val2 == NULL);
@ -200,7 +200,7 @@ sttype_test_get(stnode_t *node, test_op_t *p_op, stnode_t **p_val1, stnode_t **p
test_t *test;
test = (test_t*)stnode_data(node);
assert_magic(test, TEST_MAGIC);
ws_assert_magic(test, TEST_MAGIC);
if (p_op)
*p_op = test->op;

12
epan/dfilter/syntax-tree.h
View File

@ -146,18 +146,18 @@ log_stnode_full(enum ws_log_level level,
void log_syntax_tree(enum ws_log_level, stnode_t *root, const char *msg);
#define assert_magic(obj, mnum) \
g_assert_true((obj)); \
#define _assert_magic(obj, mnum) \
g_assert((obj)); \
if ((obj)->magic != (mnum)) { \
g_print("\nMagic num is 0x%08x, but should be 0x%08x", \
(obj)->magic, (mnum)); \
g_assert_true((obj)->magic == (mnum)); \
g_assert((obj)->magic == (mnum)); \
}
#ifdef WS_DEBUG
#define ws_assert_magic(obj, mnum) assert_magic(obj, mnum)
#ifdef WS_DISABLE_DEBUG
#define ws_assert_magic(obj, mnum) (void)0
#else
#define ws_assert_magic(obj, mnum)
#define ws_assert_magic(obj, mnum) _assert_magic(obj, mnum)
#endif
#define STTYPE_ACCESSOR(ret,type,attr,magicnum) \