X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=lib%2Fcontext.c;h=dc7736689170e10da3ba1164f543c79e334fdbe3;hb=ccde9b25397f3e74c60bfbcb9f77008299a44cc9;hp=d06742231604b6b4ea55f32a5e2deeea32e8fd71;hpb=2552c374b9c87056187ff9af572f9fba7ee7839d;p=babeltrace.git

diff --git a/lib/context.c b/lib/context.c
index d0674223..dc773668 100644
--- a/lib/context.c
+++ b/lib/context.c
@@ -67,13 +67,13 @@ struct bt_context *bt_context_create(void)
 
 int bt_context_add_trace(struct bt_context *ctx, const char *path,
 		const char *format_name,
-		void (*packet_seek)(struct stream_pos *pos, size_t index,
+		void (*packet_seek)(struct bt_stream_pos *pos, size_t index,
 			int whence),
-		struct mmap_stream_list *stream_list,
+		struct bt_mmap_stream_list *stream_list,
 		FILE *metadata)
 {
-	struct trace_descriptor *td;
-	struct format *fmt;
+	struct bt_trace_descriptor *td;
+	struct bt_format *fmt;
 	struct bt_trace_handle *handle;
 	int ret, closeret;
 
@@ -90,7 +90,7 @@ int bt_context_add_trace(struct bt_context *ctx, const char *path,
 	if (path) {
 		td = fmt->open_trace(path, O_RDONLY, packet_seek, NULL);
 		if (!td) {
-			fprintf(stderr, "[warning] [Context] Cannot open_trace of format %s at path %s.\n\n",
+			fprintf(stderr, "[warning] [Context] Cannot open_trace of format %s at path %s.\n",
 					format_name, path);
 			ret = -1;
 			goto end;
@@ -107,7 +107,7 @@ int bt_context_add_trace(struct bt_context *ctx, const char *path,
 
 	/* Create an handle for the trace */
 	handle = bt_trace_handle_create(ctx);
-	if (handle < 0) {
+	if (!handle) {
 		fprintf(stderr, "[error] [Context] Creating trace handle %s .\n\n",
 				path);
 		ret = -1;