From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Wed, 26 Jul 2017 17:21:43 +0000 (-0400)
Subject: Cleanup: remove logically dead code
X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=4dd8c9bfd3117da4a3d72f721c3d0db0a74c191d

Cleanup: remove logically dead code

Found by Coverity:

null: At condition fp, the value of fp must be NULL.
dead_error_condition: The condition fp cannot be true.

CID 1376173 (#1 of 1): Logically dead code (DEADCODE)dead_error_begin:
Execution cannot reach this statement: fclose(fp);

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

diff --git a/plugins/ctf/fs-src/metadata.c b/plugins/ctf/fs-src/metadata.c
index 383944c4..6ae43df9 100644
--- a/plugins/ctf/fs-src/metadata.c
+++ b/plugins/ctf/fs-src/metadata.c
@@ -43,29 +43,18 @@
 BT_HIDDEN
 FILE *ctf_fs_metadata_open_file(const char *trace_path)
 {
-	GString *metadata_path = g_string_new(trace_path);
+	GString *metadata_path;
 	FILE *fp = NULL;
 
+	metadata_path = g_string_new(trace_path);
 	if (!metadata_path) {
-		goto error;
+		goto end;
 	}
 
 	g_string_append(metadata_path, "/" CTF_FS_METADATA_FILENAME);
 	fp = fopen(metadata_path->str, "rb");
-	if (!fp) {
-		goto error;
-	}
-
-	goto end;
-
-error:
-	if (fp) {
-		fclose(fp);
-		fp = NULL;
-	}
-
-end:
 	g_string_free(metadata_path, TRUE);
+end:
 	return fp;
 }