From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Fri, 17 Feb 2012 17:19:39 +0000 (-0500)
Subject: Fix: Check for unknown format
X-Git-Tag: v1.0.0-pre1~17
X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=282e19520f9e89533e17a343f0809981e41530c8

Fix: Check for unknown format

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

diff --git a/lib/context.c b/lib/context.c
index 90d77df8..32efb85d 100644
--- a/lib/context.c
+++ b/lib/context.c
@@ -57,14 +57,20 @@ struct bt_context *bt_context_create(void)
 }
 
 int bt_context_add_trace(struct bt_context *ctx, const char *path,
-		const char *format_str)
+		const char *format_name)
 {
 	struct trace_descriptor *td;
 	struct format *fmt;
 	struct bt_trace_handle *handle;
 	int ret;
 
-	fmt = bt_lookup_format(g_quark_from_string(format_str));
+	fmt = bt_lookup_format(g_quark_from_string(format_name));
+	if (!fmt) {
+		fprintf(stderr, "[error] [Context] Format \"%s\" unknown.\n\n",
+			format_name);
+		ret = -1;
+		goto end;
+	}
 	td = fmt->open_trace(path, O_RDONLY,
 			     ctf_move_pos_slow, NULL);
 	if (!td) {