diff options
| author | João Valverde <j@v6e.pt> | 2021-09-30 17:05:02 +0100 |
|---|---|---|
| committer | João Valverde <j@v6e.pt> | 2021-09-30 19:11:17 +0100 |
| commit | de6f5b9d827dec4df0951c822660660be0dde4a2 (patch) | |
| tree | 1f35811a70a1adfb4e7c7aa527710f2053f68fd2 /epan/dfilter | |
| parent | b4af7c52a5bc386b2267dd10580a8a9cbdd14d0a (diff) | |
dfilter: Fixup syntax tree node display
Diffstat (limited to 'epan/dfilter')
| -rw-r--r-- | epan/dfilter/dfilter.c | 2 | ||||
| -rw-r--r-- | epan/dfilter/sttype-test.c | 2 | ||||
| -rw-r--r-- | epan/dfilter/syntax-tree.c | 5 |
3 files changed, 5 insertions, 4 deletions
diff --git a/epan/dfilter/dfilter.c b/epan/dfilter/dfilter.c index e7c48f73a0..e093668d88 100644 --- a/epan/dfilter/dfilter.c +++ b/epan/dfilter/dfilter.c @@ -208,7 +208,7 @@ const char *tokenstr(int token) case TOKEN_TEST_LT: return "TEST_LT"; case TOKEN_TEST_LE: return "TEST_LE"; case TOKEN_TEST_GT: return "TEST_GT"; - case TOKEN_TEST_GE: return "TEST_GE"; + case TOKEN_TEST_GE: return "TEST_GE"; case TOKEN_TEST_CONTAINS: return "TEST_CONTAINS"; case TOKEN_TEST_MATCHES: return "TEST_MATCHES"; case TOKEN_TEST_BITWISE_AND: return "TEST_BITWISE_AND"; diff --git a/epan/dfilter/sttype-test.c b/epan/dfilter/sttype-test.c index 8fc1e9f447..22fd4ebb5b 100644 --- a/epan/dfilter/sttype-test.c +++ b/epan/dfilter/sttype-test.c @@ -74,7 +74,7 @@ test_tostr(const void *value) switch(test->op) { case TEST_OP_EXISTS: - s = "TEST_EXIST"; + s = "TEST_EXISTS"; break; case TEST_OP_NOT: s = "TEST_NOT"; diff --git a/epan/dfilter/syntax-tree.c b/epan/dfilter/syntax-tree.c index 18e2e2bad1..7e56017da3 100644 --- a/epan/dfilter/syntax-tree.c +++ b/epan/dfilter/syntax-tree.c @@ -151,6 +151,7 @@ stnode_init(stnode_t *node, sttype_id_t type_id, gpointer data) else { node->data = data; } + node->value = 0; } void @@ -269,10 +270,10 @@ sprint_node(stnode_t *node) wmem_strbuf_append_printf(buf, "\tflags = %"PRIx16" (inside_parens = %s)\n", node->flags, true_or_false(stnode_inside_parens(node))); - s = node->type->func_tostr(node->data); + s = stnode_tostr(node); wmem_strbuf_append_printf(buf, "\tdata = %s\n", s); g_free(s); - wmem_strbuf_append_printf(buf, "\tvalue = %"PRId32"\n", node->value); + wmem_strbuf_append_printf(buf, "\tvalue = %"PRId32"\n", stnode_value(node)); wmem_strbuf_append_printf(buf, "}\n"); return wmem_strbuf_finalize(buf); } |