From 567cee92b6232f58a4e955d26fd00a18319a82b3 Mon Sep 17 00:00:00 2001 From: Philippe Proulx Date: Wed, 1 May 2019 16:56:03 -0400 Subject: [PATCH] Fix: sink.ctf.fs: do not keep different `tgt_fc_type` as `tgt_fc` changes Signed-off-by: Philippe Proulx Change-Id: Ie79306f50018d7f5ca0971e6c9a2410378a4ccc7 --- plugins/ctf/fs-sink/translate-trace-ir-to-ctf-ir.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/plugins/ctf/fs-sink/translate-trace-ir-to-ctf-ir.c b/plugins/ctf/fs-sink/translate-trace-ir-to-ctf-ir.c index 72f5e4a8..d3144a18 100644 --- a/plugins/ctf/fs-sink/translate-trace-ir-to-ctf-ir.c +++ b/plugins/ctf/fs-sink/translate-trace-ir-to-ctf-ir.c @@ -172,7 +172,6 @@ int create_relative_field_ref(struct ctx *ctx, { int ret = 0; struct fs_sink_ctf_field_class *tgt_fc = NULL; - enum fs_sink_ctf_field_class_type tgt_fc_type; uint64_t i; int64_t si; const char *tgt_fc_name = NULL; @@ -201,7 +200,6 @@ int create_relative_field_ref(struct ctx *ctx, } i = 0; - tgt_fc_type = tgt_fc->type; while (i < bt_field_path_get_item_count(tgt_ir_field_path)) { const bt_field_path_item *fp_item = @@ -212,7 +210,7 @@ int create_relative_field_ref(struct ctx *ctx, BT_ASSERT(tgt_fc); BT_ASSERT(fp_item); - switch (tgt_fc_type) { + switch (tgt_fc->type) { case FS_SINK_CTF_FIELD_CLASS_TYPE_STRUCT: BT_ASSERT(bt_field_path_item_get_type(fp_item) == BT_FIELD_PATH_ITEM_TYPE_INDEX); @@ -250,7 +248,7 @@ int create_relative_field_ref(struct ctx *ctx, } BT_ASSERT(tgt_fc); - BT_ASSERT(tgt_fc_type == FS_SINK_CTF_FIELD_CLASS_TYPE_INT); + BT_ASSERT(tgt_fc->type == FS_SINK_CTF_FIELD_CLASS_TYPE_INT); BT_ASSERT(tgt_fc_name); /* Find target field class having this name in current context */ -- 2.34.1