From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Mon, 22 Oct 2012 22:32:49 +0000 (-0400)
Subject: Cleanup: fix cppcheck warning
X-Git-Tag: v1.0.0~6
X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=6ca30a47e61ba2c3e5376bbc0d8b90b634bb8e84

Cleanup: fix cppcheck warning

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

diff --git a/formats/ctf/metadata/ctf-visitor-generate-io-struct.c b/formats/ctf/metadata/ctf-visitor-generate-io-struct.c
index 7cc84953..5104c62b 100644
--- a/formats/ctf/metadata/ctf-visitor-generate-io-struct.c
+++ b/formats/ctf/metadata/ctf-visitor-generate-io-struct.c
@@ -823,7 +823,6 @@ struct declaration *ctf_declaration_struct_visit(FILE *fd,
 {
 	struct declaration_struct *struct_declaration;
 	struct ctf_node *iter;
-	int ret;
 
 	/*
 	 * For named struct (without body), lookup in
@@ -851,6 +850,8 @@ struct declaration *ctf_declaration_struct_visit(FILE *fd,
 			}
 		}
 		if (!bt_list_empty(min_align)) {
+			int ret;
+
 			ret = get_unary_unsigned(min_align, &min_align_value);
 			if (ret) {
 				fprintf(fd, "[error] %s: unexpected unary expression for structure \"align\" attribute\n", __func__);
@@ -861,12 +862,16 @@ struct declaration *ctf_declaration_struct_visit(FILE *fd,
 		struct_declaration = struct_declaration_new(declaration_scope,
 							    min_align_value);
 		bt_list_for_each_entry(iter, declaration_list, siblings) {
+			int ret;
+
 			ret = ctf_struct_declaration_list_visit(fd, depth + 1, iter,
 				struct_declaration, trace);
 			if (ret)
 				goto error_free_declaration;
 		}
 		if (name) {
+			int ret;
+
 			ret = register_struct_declaration(g_quark_from_string(name),
 					struct_declaration,
 					declaration_scope);