X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=liblttng-ust%2Flttng-bytecode-validator.c;h=267c5c19635a3ab56fe454ee80357c3fc1b60a7c;hb=f1324c1158b8ad5b9dd8bcc55e2a1a26ab2113ae;hp=b5bc49041c61c8d0ce115ffe9f365ccb2139a83b;hpb=362a65de6aba2cbc27c61c9fc23e755cb617837f;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-bytecode-validator.c b/liblttng-ust/lttng-bytecode-validator.c
index b5bc4904..267c5c19 100644
--- a/liblttng-ust/lttng-bytecode-validator.c
+++ b/liblttng-ust/lttng-bytecode-validator.c
@@ -17,6 +17,7 @@
 #include "lttng-hash-helper.h"
 #include "string-utils.h"
 #include "ust-events-internal.h"
+#include "ust-helper.h"
 
 /*
  * Number of merge points for hash table size. Hash table initialized to
@@ -208,7 +209,8 @@ error_type:
  * (unknown), negative error value on error.
  */
 static
-int bin_op_bitwise_check(struct vstack *stack, bytecode_opcode_t opcode,
+int bin_op_bitwise_check(struct vstack *stack,
+		bytecode_opcode_t opcode __attribute__((unused)),
 		const char *str)
 {
 	if (unlikely(!vstack_ax(stack) || !vstack_bx(stack)))
@@ -255,11 +257,11 @@ int validate_get_symbol(struct bytecode_runtime *bytecode,
 	const char *str, *str_limit;
 	size_t len_limit;
 
-	if (sym->offset >= bytecode->p.priv->bc->bc.len - bytecode->p.priv->bc->bc.reloc_offset)
+	if (sym->offset >= bytecode->p.bc->bc.len - bytecode->p.bc->bc.reloc_offset)
 		return -EINVAL;
 
-	str = bytecode->p.priv->bc->bc.data + bytecode->p.priv->bc->bc.reloc_offset + sym->offset;
-	str_limit = bytecode->p.priv->bc->bc.data + bytecode->p.priv->bc->bc.len;
+	str = bytecode->p.bc->bc.data + bytecode->p.bc->bc.reloc_offset + sym->offset;
+	str_limit = bytecode->p.bc->bc.data + bytecode->p.bc->bc.len;
 	len_limit = str_limit - str;
 	if (strnlen(str, len_limit) == len_limit)
 		return -EINVAL;
@@ -552,7 +554,8 @@ unsigned long delete_all_nodes(struct lttng_ust_lfht *ht)
  * <0: error
  */
 static
-int validate_instruction_context(struct bytecode_runtime *bytecode,
+int validate_instruction_context(
+		struct bytecode_runtime *bytecode __attribute__((unused)),
 		struct vstack *stack,
 		char *start_pc,
 		char *pc)
@@ -1253,7 +1256,7 @@ int validate_instruction_all_contexts(struct bytecode_runtime *bytecode,
  * <0: error
  */
 static
-int exec_insn(struct bytecode_runtime *bytecode,
+int exec_insn(struct bytecode_runtime *bytecode __attribute__((unused)),
 		struct lttng_ust_lfht *merge_points,
 		struct vstack *stack,
 		char **_next_pc,