Fix: remove dead code from filter interpreter
authorMathieu Desnoyers <mathieu.desnoyers@efficios.com>
Tue, 5 Apr 2016 13:30:31 +0000 (09:30 -0400)
committerMathieu Desnoyers <mathieu.desnoyers@efficios.com>
Tue, 5 Apr 2016 13:30:31 +0000 (09:30 -0400)
This has been detected in the lttng-modules port of the filter
interpreter by Coverity. The intent of the code in UST is similar, and
we can find the same dead code, although Coverity may not see it as dead
code because it cannot prove that the string is not modified between the
two uses. Since we know it is not modified, remove the dead code.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
liblttng-ust/lttng-filter-interpreter.c

index 1f95dcf576b1c84fe53455ae3cc2fcf6b98187cb..3eee8e00a90564e0d100a292853dcca742ec61b3 100644 (file)
@@ -72,16 +72,12 @@ int stack_strcmp(struct estack *stack, int top, const char *cmp_type)
                        }
                }
                if (unlikely(q - estack_ax(stack, top)->u.s.str >= estack_ax(stack, top)->u.s.seq_len || *q == '\0')) {
-                       if (p - estack_bx(stack, top)->u.s.str >= estack_bx(stack, top)->u.s.seq_len || *p == '\0') {
-                               return 0;
-                       } else {
-                               if (estack_bx(stack, top)->u.s.literal) {
-                                       ret = parse_char(&p);
-                                       if (ret == -1)
-                                               return 0;
-                               }
-                               return 1;
+                       if (estack_bx(stack, top)->u.s.literal) {
+                               ret = parse_char(&p);
+                               if (ret == -1)
+                                       return 0;
                        }
+                       return 1;
                }
                if (estack_bx(stack, top)->u.s.literal) {
                        ret = parse_char(&p);
This page took 0.025311 seconds and 4 git commands to generate.