Cleanup: have interpreter functions return _DISCARD instead of 0

[lttng-modules.git] / src / lttng-filter-interpreter.c

diff --git a/src/lttng-filter-interpreter.c b/src/lttng-filter-interpreter.c
index 5ba7e230094458fd864bc7500ce60bf6988dc391..6c1c2f279e021391589cf28e1ae41976bc21cb80 100644 (file)
--- a/src/lttng-filter-interpreter.c
+++ b/src/lttng-filter-interpreter.c
@@ -221,7 +221,7 @@ uint64_t lttng_filter_false(void *filter_data,
                struct lttng_probe_ctx *lttng_probe_ctx,
                const char *filter_stack_data)
 {
-       return 0;
+       return LTTNG_FILTER_DISCARD;
 }
 
 #ifdef INTERPRETER_USE_SWITCH
@@ -511,7 +511,7 @@ static int dynamic_load_field(struct estack_entry *stack_top)
        {
                uint16_t tmp;
 
-               dbg_printk("op load field s16\n");
+               dbg_printk("op load field u16\n");
                tmp = *(uint16_t *) stack_top->u.ptr.ptr;
                if (stack_top->u.ptr.rev_bo)
                        __swab16s(&tmp);
@@ -771,7 +771,7 @@ uint64_t lttng_filter_interpret_bytecode(void *filter_data,
 
                OP(FILTER_OP_RETURN):
                OP(FILTER_OP_RETURN_S64):
-                       /* LTTNG_FILTER_DISCARD  or LTTNG_FILTER_RECORD_FLAG */
+                       /* LTTNG_FILTER_DISCARD or LTTNG_FILTER_RECORD_FLAG */
                        retval = !!estack_ax_v;
                        ret = 0;
                        goto end;
@@ -1567,9 +1567,9 @@ uint64_t lttng_filter_interpret_bytecode(void *filter_data,
 
        END_OP
 end:
-       /* return 0 (discard) on error */
+       /* Return _DISCARD on error. */
        if (ret)
-               return 0;
+               return LTTNG_FILTER_DISCARD;
        return retval;
 }