From: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Date: Thu, 2 Feb 2017 17:23:09 +0000 (-0500)
Subject: Fix: log structure field name on serialization failure
X-Git-Tag: v2.0.0-pre1~521
X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=bf3a205bb8ce9c01e6a2750f6853b74de4fb36b2

Fix: log structure field name on serialization failure

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---

diff --git a/formats/ctf/ir/fields.c b/formats/ctf/ir/fields.c
index cf08e780..f5b69784 100644
--- a/formats/ctf/ir/fields.c
+++ b/formats/ctf/ir/fields.c
@@ -1979,20 +1979,20 @@ int bt_ctf_field_structure_serialize(struct bt_ctf_field *field,
 	}
 
 	for (i = 0; i < structure->fields->len; i++) {
-		struct bt_ctf_field *field = g_ptr_array_index(
+		struct bt_ctf_field *member = g_ptr_array_index(
 			structure->fields, i);
 
-		ret = bt_ctf_field_serialize(field, pos);
+		ret = bt_ctf_field_serialize(member, pos);
 		if (ret) {
 			const char *name;
-			struct bt_ctf_field_type *field_type =
+			struct bt_ctf_field_type *structure_type =
 					bt_ctf_field_get_type(field);
 
-			(void) bt_ctf_field_type_structure_get_field(field_type,
-					&name, NULL, i);
+			(void) bt_ctf_field_type_structure_get_field(
+					structure_type, &name, NULL, i);
 			fprintf(stderr, "Field %s failed to serialize\n",
 					name ? name : "NULL");
-			bt_put(field_type);
+			bt_put(structure_type);
 			break;
 		}
 	}